Fixed Attachment filename issues