Send mail - enhancements, attachments
resolved conflicts