WL-2179 Correctly place attachments in email archive.

When putting a message into the email archive also store the attachments. The code just was ignoring the attachments.