diff --git a/include/admin/entries_overview.inc.php b/include/admin/entries_overview.inc.php
index 405a4f60..ebb436ff 100644
--- a/include/admin/entries_overview.inc.php
+++ b/include/admin/entries_overview.inc.php
@@ -1,12 +1,19 @@
 <?php # $Id$
-# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
-# All rights reserved.  See LICENSE file for licensing details
-/* vim: set sts=4 ts=4 expandtab : */
 
 if (IN_serendipity !== true) {
     die ('Don\'t hack!');
 }
 
-echo WELCOME_BACK . ' ' . htmlspecialchars($_SESSION['serendipityUser']);
+if (!is_object($serendipity['smarty'])) {
+    serendipity_smarty_init();
+}
 
-?>
+$serendipity['smarty']->assign($data);
+
+$tfile = dirname(__FILE__) . "/tpl/entries_overview.inc.tpl";
+
+$content = $serendipity['smarty']->fetch('file:'. $tfile); // short notation with Smarty3 in S9y 1.7 and up
+
+echo $content;
+
+/* vim: set sts=4 ts=4 expandtab : */
diff --git a/include/admin/tpl/entries_overview.inc.tpl b/include/admin/tpl/entries_overview.inc.tpl
new file mode 100644
index 00000000..b0b8ec1e
--- /dev/null
+++ b/include/admin/tpl/entries_overview.inc.tpl
@@ -0,0 +1,3 @@
+
+{$CONST.WELCOME_BACK} {$smarty.session.serendipityUser|escape}
+