more imap bodystructure related fixes
more bodystructure related fixes
outbound mail related fixes