Forward a message AND its attachments.

Code cleanup.

see #545
Wrong import statements fixed.

see #545
Only decode when necessary.

fix #545