diff --git a/web/root/msgs/msgs.ssjs b/web/root/msgs/msgs.ssjs
index 1c3894f4d2f48594a93a8921cb7558be6737b733..e51e025a41c3a6d4564e0dca6f735adf51b395ea 100644
--- a/web/root/msgs/msgs.ssjs
+++ b/web/root/msgs/msgs.ssjs
@@ -37,23 +37,35 @@ else {
 	if(new_query.length>0)
 		new_query+='&';
 	new_query+='show_messages=';
-	switch(ShowMsgs) {
-		case GET_ALL_MESSAGES:
-			template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'Yours">'+show_messages_yours_html+'</a>';
-			template.show_choice+=show_messages_spacer_html;
-			template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'YourUnread">'+show_messages_your_unread_html+'</a>';
-			break;
-		case GET_MY_MESSAGES:
-			template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'All">'+show_messages_all_html+'</a>';
-			template.show_choice+=show_messages_spacer_html;
-			template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'YourUnread">'+show_messages_your_unread_html+'</a>';
-			break;
-		case GET_MY_UNREAD_MESSAGES:
-			template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'All">'+show_messages_all_html+'</a>';
-			template.show_choice+=show_messages_spacer_html;
-			template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'Yours">'+show_messages_yours_html+'</a>';
-			break;
-	}
+    if(sub=='mail') {
+        switch(ShowMsgs) {
+		    case GET_ALL_MESSAGES:
+		    case GET_MY_MESSAGES:
+			    template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'YourUnread">'+show_messages_your_unread_html+'</a>';
+			    break;
+		    case GET_MY_UNREAD_MESSAGES:
+			    template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'All">'+show_messages_all_html+'</a>';
+			    break;
+	    }
+    } else {
+        switch(ShowMsgs) {
+		    case GET_ALL_MESSAGES:
+			    template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'Yours">'+show_messages_yours_html+'</a>';
+			    template.show_choice+=show_messages_spacer_html;
+			    template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'YourUnread">'+show_messages_your_unread_html+'</a>';
+			    break;
+		    case GET_MY_MESSAGES:
+			    template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'All">'+show_messages_all_html+'</a>';
+			    template.show_choice+=show_messages_spacer_html;
+			    template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'YourUnread">'+show_messages_your_unread_html+'</a>';
+			    break;
+		    case GET_MY_UNREAD_MESSAGES:
+			    template.show_choice='<a href="'+http_request.virtual_path+'?'+new_query+'All">'+show_messages_all_html+'</a>';
+			    template.show_choice+=show_messages_spacer_html;
+			    template.show_choice+='<a href="'+http_request.virtual_path+'?'+new_query+'Yours">'+show_messages_yours_html+'</a>';
+			    break;
+	    }
+    }
 }
 
 /* Ensure that offset is an even multiple of max_messages */