Bug 1000176 - Investigate and fix failure in test_sms_with_attachments
Merge pull request #18595 from viorelaioia/bug_1000176_v1.5

Bug 1000176 - Investigate and fix failure in test_sms_with_attachments