diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index aee9055e..ba845867 100644
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -160,7 +160,10 @@ function serendipity_drawList() {
         $data['serverOffsetHour']  = serendipity_serverOffsetHour();
         $data['showFutureEntries'] = $serendipity['showFutureEntries'];
 
-    } // entries end 
+    } else {
+        $data['no_entries'] = true;
+    } // if entries end
+
 } // End function serendipity_drawList()
 
 if (!empty($serendipity['GET']['editSubmit'])) {
diff --git a/include/admin/tpl/entries.inc.tpl b/include/admin/tpl/entries.inc.tpl
index bb152030..82391ea4 100644
--- a/include/admin/tpl/entries.inc.tpl
+++ b/include/admin/tpl/entries.inc.tpl
@@ -123,7 +123,7 @@
                     <span class="status_draft">{$CONST.DRAFT}</span>
                 {/if}
                     <span class="status_timestamp">
-                        {$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - (60*30))} <a class="icon_link" href="#" title="{$CONST.LAST_UPDATED}: {$entry.last_modified|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}" onclick="alert(this.title)"><span class="icon-info-circle"></span><span class="visuallyhidden"> {$CONST.LAST_UPDATED}</span></a>{/if}
+                        {$entry.timestamp|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}{if $entry.timestamp <= ($entry.last_modified - 1800)} <a class="icon_link" href="#" title="{$CONST.LAST_UPDATED}: {$entry.last_modified|@formatTime:"{$CONST.DATE_FORMAT_SHORT}"}" onclick="alert(this.title)"><span class="icon-info-circle"></span><span class="visuallyhidden"> {$CONST.LAST_UPDATED}</span></a>{/if}
                     </span>
                 </div>
 
@@ -172,8 +172,7 @@
         <input name="serendipity[editSubmit]" type="submit" value="{$CONST.GO}">
     </form>
 {/if}
-{* BUG: This seems to be triggered if only one entry is present and said entry should be deleted? Ian: Is it gone now? YL: Nope, still triggered. *}
-{if ( ( (!$switched_output && empty($entries)) || (!$drawList && empty($entries)) ) && ( $get.adminAction != 'new' &&  $get.adminAction != 'edit' ) && !$is_iframepreview )}
+{if $no_entries}
     <span class="msg_notice"><span class="icon-info-circle"></span> {$CONST.NO_ENTRIES_TO_PRINT}</span>
 {/if}
 
diff --git a/include/admin/tplold/entries.inc.tpl b/include/admin/tplold/entries.inc.tpl
index c88b9f7e..16c9002a 100644
--- a/include/admin/tplold/entries.inc.tpl
+++ b/include/admin/tplold/entries.inc.tpl
@@ -193,7 +193,7 @@
 </div><!-- // div.serendipity_admin_list drawList end -->
 
 {/if}{* $drawList end *}
-{if ( ( (!$switched_output && empty($entries)) || (!$drawList && empty($entries)) ) && ( $get.adminAction != 'new' &&  $get.adminAction != 'edit' ) && !$is_iframepreview )}
+{if $no_entries}
 
 <div class="serendipity_admin_list">