Tweak #2162 Long Filenames for Attachments
Merge pull request #2178 from mahagr/master

Tweak #2162 Long Filenames for Attachments