Fix handling of message/rfc822 attachments on message forward and edit (#1489214)