re #899 - Fixed error when no attachment is added
Merge branch 'feature/899-contacts'