diff --git a/mod/message.php b/mod/message.php
index eba1c9a62..9e0cb32c0 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -10,107 +10,104 @@ require_once 'include/acl_selectors.php';
 require_once 'include/message.php';
 require_once 'include/conversation.php';
 
-function message_init(App $a) {
-
+function message_init(App $a)
+{
 	$tabs = '';
 
-	if ($a->argc >1 && is_numeric($a->argv[1])) {
-		$tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+	if ($a->argc > 1 && is_numeric($a->argv[1])) {
+		$tabs = render_messages(get_messages(local_user(), 0, 5), 'mail_list.tpl');
 	}
 
 	$new = array(
 		'label' => t('New Message'),
 		'url' => 'message/new',
-		'sel'=> ($a->argv[1] == 'new'),
+		'sel' => $a->argc > 1 && $a->argv[1] == 'new',
 		'accesskey' => 'm',
 	);
 
 	$tpl = get_markup_template('message_side.tpl');
 	$a->page['aside'] = replace_macros($tpl, array(
-		'$tabs'=>$tabs,
-		'$new'=>$new,
+		'$tabs' => $tabs,
+		'$new' => $new,
 	));
 	$base = System::baseUrl();
 
 	$head_tpl = get_markup_template('message-head.tpl');
-	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
+	$a->page['htmlhead'] .= replace_macros($head_tpl, array(
 		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
 	));
 
 	$end_tpl = get_markup_template('message-end.tpl');
-	$a->page['end'] .= replace_macros($end_tpl,array(
+	$a->page['end'] .= replace_macros($end_tpl, array(
 		'$baseurl' => System::baseUrl(true),
 		'$base' => $base
 	));
-
 }
 
-function message_post(App $a) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function message_post(App $a)
+{
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
-	$replyto   = ((x($_REQUEST,'replyto'))   ? notags(trim($_REQUEST['replyto']))   : '');
-	$subject   = ((x($_REQUEST,'subject'))   ? notags(trim($_REQUEST['subject']))   : '');
-	$body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
-	$recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
+	$replyto   = x($_REQUEST, 'replyto')   ? notags(trim($_REQUEST['replyto']))   : '';
+	$subject   = x($_REQUEST, 'subject')   ? notags(trim($_REQUEST['subject']))   : '';
+	$body      = x($_REQUEST, 'body')      ? escape_tags(trim($_REQUEST['body'])) : '';
+	$recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto'])       : 0;
 
 	$ret = send_message($recipient, $body, $subject, $replyto);
 	$norecip = false;
 
-	switch($ret){
+	switch ($ret) {
 		case -1:
-			notice( t('No recipient selected.') . EOL );
+			notice(t('No recipient selected.') . EOL);
 			$norecip = true;
 			break;
 		case -2:
-			notice( t('Unable to locate contact information.') . EOL );
+			notice(t('Unable to locate contact information.') . EOL);
 			break;
 		case -3:
-			notice( t('Message could not be sent.') . EOL );
+			notice(t('Message could not be sent.') . EOL);
 			break;
 		case -4:
-			notice( t('Message collection failure.') . EOL );
+			notice(t('Message collection failure.') . EOL);
 			break;
 		default:
-			info( t('Message sent.') . EOL );
+			info(t('Message sent.') . EOL);
 	}
 
 	// fake it to go back to the input form if no recipient listed
-
 	if ($norecip) {
 		$a->argc = 2;
 		$a->argv[1] = 'new';
-	} else
+	} else {
 		goaway($_SESSION['return_url']);
-
+	}
 }
 
-function message_content(App $a) {
-
+function message_content(App $a)
+{
 	$o = '';
 	nav_set_selected('messages');
 
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
-	$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
+	$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
 		'$messages' => t('Messages'),
-		'$tab_content' => $tab_content
 	));
 
-
 	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
-		if (! intval($a->argv[2]))
+		if (!intval($a->argv[2])) {
 			return;
+		}
 
 		// Check if we should do HTML-based delete confirmation
 		if ($_REQUEST['confirm']) {
@@ -118,7 +115,7 @@ function message_content(App $a) {
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
 			$inputs = array();
-			foreach($query['args'] as $arg) {
+			foreach ($query['args'] as $arg) {
 				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
 					$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
@@ -148,7 +145,7 @@ function message_content(App $a) {
 				intval(local_user())
 			);
 			if ($r) {
-				info( t('Message deleted.') . EOL );
+				info(t('Message deleted.') . EOL);
 			}
 			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
@@ -170,24 +167,22 @@ function message_content(App $a) {
 				// Actually if we do this, we can never receive another reply to that conversation,
 				// as we will never again have the info we need to re-create it.
 				// We'll just have to orphan it.
-
 				//if ($convid) {
 				//	q("delete from conv where id = %d limit 1",
 				//		intval($convid)
 				//	);
 				//}
 
-				if ($r)
-					info( t('Conversation removed.') . EOL );
+				if ($r) {
+					info(t('Conversation removed.') . EOL);
+				}
 			}
 			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
 		}
-
 	}
 
 	if (($a->argc > 1) && ($a->argv[1] === 'new')) {
-
 		$o .= $header;
 
 		$tpl = get_markup_template('msg-header.tpl');
@@ -204,8 +199,7 @@ function message_content(App $a) {
 			'$linkurl' => t('Please enter a link URL:')
 		));
 
-		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
-
+		$preselect = isset($a->argv[2]) ? array($a->argv[2]) : false;
 
 		$prename = $preurl = $preid = '';
 
@@ -233,18 +227,18 @@ function message_content(App $a) {
 				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
 				$preselect = array($preid);
-			} else
+			} else {
 				$preselect = false;
+			}
 		}
 
-		$prefill = (($preselect) ? $prename  : '');
+		$prefill = $preselect ? $prename : '';
 
 		// the ugly select box
-
-		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+		$select = contact_select('messageto', 'message-to-select', $preselect, 4, true, false, false, 10);
 
 		$tpl = get_markup_template('prv_message.tpl');
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl, array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
 			'$showinputs' => 'true',
@@ -252,8 +246,8 @@ function message_content(App $a) {
 			'$autocomp' => $autocomp,
 			'$preid' => $preid,
 			'$subject' => t('Subject:'),
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+			'$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
+			'$text' => x($_REQUEST, 'body') ? escape_tags(htmlspecialchars($_REQUEST['body'])) : '',
 			'$readonly' => '',
 			'$yourmessage' => t('Your message:'),
 			'$select' => $select,
@@ -286,8 +280,8 @@ function message_content(App $a) {
 
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-		if (! DBM::is_result($r)) {
-			info( t('No messages.') . EOL);
+		if (!DBM::is_result($r)) {
+			info(t('No messages.') . EOL);
 			return $o;
 		}
 
@@ -325,8 +319,8 @@ function message_content(App $a) {
 				intval(local_user())
 			);
 		}
-		if (! count($messages)) {
-			notice( t('Message not available.') . EOL );
+		if (!count($messages)) {
+			notice(t('Message not available.') . EOL);
 			return $o;
 		}
 
@@ -355,24 +349,24 @@ function message_content(App $a) {
 		$seen = 0;
 		$unknown = false;
 
-		foreach($messages as $message) {
+		foreach ($messages as $message) {
 			if ($message['unknown'])
 				$unknown = true;
 			if ($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
 			} elseif ($message['contact-id'] != 0) {
-				$from_url = 'redir/'.$message['contact-id'];
+				$from_url = 'redir/' . $message['contact-id'];
 				$sparkle = ' sparkle';
 			} else {
-				$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
+				$from_url = $message['from-url'] . "?zrl=" . urlencode($myprofile);
 				$sparkle = ' sparkle';
 			}
 
-
 			$extracted = item_extract_images($message['body']);
-			if ($extracted['images'])
+			if ($extracted['images']) {
 				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
+			}
 
 			$from_name_e = $message['from-name'];
 			$subject_e = $message['title'];
@@ -380,10 +374,11 @@ function message_content(App $a) {
 			$to_name_e = $message['name'];
 
 			$contact = Contact::getDetailsByURL($message['from-url']);
-			if (isset($contact["thumb"]))
+			if (isset($contact["thumb"])) {
 				$from_photo = $contact["thumb"];
-			else
+			} else {
 				$from_photo = $message['from-photo'];
+			}
 
 			$mails[] = array(
 				'id' => $message['id'],
@@ -396,26 +391,22 @@ function message_content(App $a) {
 				'body' => $body_e,
 				'delete' => t('Delete message'),
 				'to_name' => $to_name_e,
-				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
-                                'ago' => relative_date($message['created']),
+				'date' => datetime_convert('UTC', date_default_timezone_get(), $message['created'], 'D, d M Y - g:i A'),
+				'ago' => relative_date($message['created']),
 			);
 
 			$seen = $message['seen'];
 		}
 
-
 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
 		$tpl = get_markup_template('mail_display.tpl');
-
-		$subjtxt_e = $message['title'];
-
 		$o = replace_macros($tpl, array(
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
-			'$delete' =>  t('Delete conversation'),
+			'$delete' => t('Delete conversation'),
 			'$canreply' => (($unknown) ? false : '1'),
 			'$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
 			'$mails' => $mails,
@@ -425,7 +416,7 @@ function message_content(App $a) {
 			'$to' => t('To:'),
 			'$showinputs' => '',
 			'$subject' => t('Subject:'),
-			'$subjtxt' => $subjtxt_e,
+			'$subjtxt' => $message['title'],
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
 			'$yourmessage' => t('Your message:'),
 			'$text' => '',
@@ -435,14 +426,14 @@ function message_content(App $a) {
 			'$insert' => t('Insert web link'),
 			'$submit' => t('Submit'),
 			'$wait' => t('Please wait')
-
 		));
 
 		return $o;
 	}
 }
 
-function get_messages($user, $lstart, $lend) {
+function get_messages($user, $lstart, $lend)
+{
 	//TODO: rewritte with a sub-query to get the first message of each private thread with certainty
 	return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
 		ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`,
@@ -461,33 +452,34 @@ function get_messages($user, $lstart, $lend) {
 	);
 }
 
-function render_messages(array $msg, $t) {
-
+function render_messages(array $msg, $t)
+{
 	$a = get_app();
 
 	$tpl = get_markup_template($t);
 	$rslt = '';
 
-	$myprofile = System::baseUrl().'/profile/' . $a->user['nickname'];
+	$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
-	foreach($msg as $rr) {
-
-		if ($rr['unknown'])
-			$participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
-		elseif (link_compare($rr['from-url'], $myprofile))
-			$participants = sprintf( t("You and %s"), $rr['name']);
-		else
-			$participants = sprintf(t("%s and You"), $rr['from-name']);
+	foreach ($msg as $rr) {
+		if ($rr['unknown']) {
+			$participants = t("Unknown sender - %s", $rr['from-name']);
+		} elseif (link_compare($rr['from-url'], $myprofile)) {
+			$participants = t("You and %s", $rr['name']);
+		} else {
+			$participants = t("%s and You", $rr['from-name']);
+		}
 
 		$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
 		$body_e = $rr['body'];
 		$to_name_e = $rr['name'];
 
 		$contact = Contact::getDetailsByURL($rr['url']);
-		if (isset($contact["thumb"]))
+		if (isset($contact["thumb"])) {
 			$from_photo = $contact["thumb"];
-		else
+		} else {
 			$from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']);
+		}
 
 		$rslt .= replace_macros($tpl, array(
 			'$id' => $rr['id'],
@@ -500,10 +492,10 @@ function render_messages(array $msg, $t) {
 			'$delete' => t('Delete conversation'),
 			'$body' => $body_e,
 			'$to_name' => $to_name_e,
-			'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
-															'$ago' => relative_date($rr['mailcreated']),
+			'$date' => datetime_convert('UTC', date_default_timezone_get(), $rr['mailcreated'], t('D, d M Y - g:i A')),
+			'$ago' => relative_date($rr['mailcreated']),
 			'$seen' => $rr['mailseen'],
-			'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
+			'$count' => tt('%d message', '%d messages', $rr['count']),
 		));
 	}