(Hopefully) Added support for attachments in forwarding