diff --git a/Templates/Message/archive.tpl b/Templates/Message/archive.tpl
index 2c28d2b6..3f9406b1 100644
--- a/Templates/Message/archive.tpl
+++ b/Templates/Message/archive.tpl
@@ -16,10 +16,10 @@ include("menu.tpl");
 		<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" /> <input name="start" type="image" value="Back" alt="Back" id="btn_back" class="dynamic_img" src="img/x.gif" /></th>
         <th class="navi"><?php
     if(!isset($_GET['s']) && count($message->archived1) < 10) {
-    echo "&laquo;&raquo;";
+        echo "&laquo;&raquo;";
     }
     else if (!isset($_GET['s']) && count($message->archived1) > 10) {
-    echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&o=0\">&raquo;</a>";
+        echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=10&o=0\">&raquo;</a>";
     }
     else if(isset($_GET['s']) && count($message->archived1) > $_GET['s']) {
     	if(count($message->archived1) > ($_GET['s']+10) && $_GET['s']-10 < count($message->archived1) && $_GET['s'] != 0) {
@@ -28,8 +28,8 @@ include("menu.tpl");
          else if(count($message->archived1) > $_GET['s']+10) {
          	echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
          }
-        else {
-        echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
+        else if (count($message->archived1) > 10) {
+            echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
         }
     }
     ?></th></tr></tfoot><tbody>
diff --git a/Templates/Message/inbox.tpl b/Templates/Message/inbox.tpl
index 3822104d..f8dc6f4b 100644
--- a/Templates/Message/inbox.tpl
+++ b/Templates/Message/inbox.tpl
@@ -37,8 +37,8 @@
 		else if(count($message->inbox1) > $_GET['s']+10) {
          	echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=0\">&raquo;</a>";
 		}
-		else {
-		echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
+		else if(count($message->inbox1) > 10) {
+		    echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=0\">&laquo;</a>&raquo;";
 		}
 		}
 		?></th></tr></tfoot><tbody>
diff --git a/Templates/Message/sent.tpl b/Templates/Message/sent.tpl
index b917305e..35869e63 100644
--- a/Templates/Message/sent.tpl
+++ b/Templates/Message/sent.tpl
@@ -43,7 +43,7 @@
          else if(count($message->sent1) > $_GET['s']+10) {
          	echo "&laquo;<a href=\"?t=2&s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
          }
-        else {
+        else if (count($message->sent1) > 10) {
         echo "<a href=\"?t=2&s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a>&raquo;";
         }
     }
diff --git a/Templates/Notice/all.tpl b/Templates/Notice/all.tpl
index 5cbb538d..4dacb26c 100644
--- a/Templates/Notice/all.tpl
+++ b/Templates/Notice/all.tpl
@@ -44,7 +44,7 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
          else if(count($message->noticearray) > $_GET['s']+10) {
          	echo "&laquo;<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']+10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&raquo;</a>";
          }
-        else {
+        else if (count($message->noticearray) > 10) {
         echo "<a href=\"?".(!empty($_GET['t']) ? 't='.$_GET['t'].'&amp;' : '')."s=".($_GET['s']-10)."&o=".(!empty($_GET['o']) ? $_GET['o'] : 0)."\">&laquo;</a>&raquo;";
         }
     }