diff --git a/mod/message.php b/mod/message.php
index e1a86727bc..3aac2ec28d 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -196,7 +196,7 @@ function message_content(&$a) {
 		);
 		if(! count($r)) {
 			notice( t('No messages.') . EOL);
-			return;
+			return $o;
 		}
 
 		$tpl = file_get_contents('view/mail_list.tpl');
@@ -238,7 +238,7 @@ function message_content(&$a) {
 		}
 		if(! count($messages)) {
 			notice( t('Message not available.') . EOL );
-			return;
+			return $o;
 		}
 
 		$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
index dd53d621ab..eac79eb59a 100644
--- a/view/mail_head.tpl
+++ b/view/mail_head.tpl
@@ -3,7 +3,7 @@
 <div class="message-links">
 <ul>
 <li><a href="message" class="message-link-inbox">$inbox</a></li>
-<li><a href="message/sent" class="message-link-outbox">$outbox</li>
-<li><a href="message/new" class="message-link-new">$new</li>
+<li><a href="message/sent" class="message-link-outbox">$outbox</a></li>
+<li><a href="message/new" class="message-link-new">$new</a></li>
 <ul>
 </div>