Clean up singlepart multipart mail submitted by kaiten mail

If kaiten now sends a message whose toplevel content-type is multipart,
but which contains only a single bodypart, the message will now be
fixified before being passed on.
expression order bugfix.

not serious; this would only lead to the wrong error messages being
returned for (some) syntax errors.