Merge remote-tracking branch 'origin/poonam-edits'
Merge remote-tracking branch 'origin/poonam-edits'
#102 Email Subject now has prefix
#90 Duplicate Attachment, + Error Message Fixes
Merge remote-tracking branch 'origin/master' into poonam-edits