Fix #262 for attachements
Merge pull request #278 from PolyLAN/fix_262

Fix #262 for attachements