Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

include/message.php

@@ -210,8 +210,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		intval($channel['channel_id']),
 		dbesc($channel['channel_hash']),
 		dbesc($recipient),
-		dbesc($subject),
 		dbesc(($mimetype)? $mimetype : 'text/bbcode'),
+		dbesc($subject),
 		dbesc($body),
 		dbesc($sig),
 		dbesc($jattach),