Merge email-with-attachments branch
Update comment to a TODO to support binary attachments