Fix handle of attachment messages with attachments#343

Merged

Slamdunk merged 2 commits intoddeboer:masterfrom Slamdunk:issue_342

May 4, 2018

+169-1

Commits on May 3, 2018

Reproduce issue ddeboer#342
Slamdunk
committed

Commits on May 4, 2018

Fix ?
Slamdunk
committed