Incorporated the review comments for attachments in mail  feature
from Dan Notestein.

Yuvaraj