diff --git a/config.inc.php b/config.inc.php
index 8863f1b7..5d54f6a3 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -286,6 +286,13 @@ $CONF['show_footer_text'] = 'YES';
 $CONF['footer_text'] = 'Return to change-this-to-your.domain.tld';
 $CONF['footer_link'] = 'http://change-this-to-your.domain.tld';
 
+// MOTD ("Motto of the day")
+// You can display a MOTD below the menu on all pages.
+// This can be configured seperately for users, domain admins and superadmins
+$CONF['motd_user'] = '';
+$CONF['motd_admin'] = '';
+$CONF['motd_superadmin'] = '';
+
 // Welcome Message
 // This message is send to every newly created mailbox.
 // Change the text between EOM.
diff --git a/css/default.css b/css/default.css
index d462d414..0dfa403b 100644
--- a/css/default.css
+++ b/css/default.css
@@ -81,6 +81,11 @@ ul.flash-error {
 	color: #d01313;
 }
 
+#motd {
+	color: maroon;
+	padding-top:2em;
+}
+
 .standout {
 	color: maroon;
 	padding: 3px 3px 3px 3px;
diff --git a/smarty.inc.php b/smarty.inc.php
index 6fe3313c..f1ddfdfb 100644
--- a/smarty.inc.php
+++ b/smarty.inc.php
@@ -66,16 +66,6 @@ $smarty->assign ('version', $version);
 $smarty->assign ('boolconf_alias_domain', boolconf('alias_domain'));
 $smarty->assign ('authentication_has_role', array ('global_admin' => authentication_has_role ('global-admin'), 'admin' => authentication_has_role ('admin'), 'user' => authentication_has_role ('user')));
 
-if (authentication_has_role('global-admin')) {
-    $motd_file = "motd-admin.txt";
-} else {
-    $motd_file = "motd.txt";
-}
-$smarty->assign('motd_file', '');
-if (file_exists ($incpath.'/templates/'.$motd_file)) {
-    $smarty->assign ('motd_file', $motd_file);
-}
-
 function select_options($aValues, $aSelected) {
     $ret_val = '';
     foreach ($aValues as $val) {
diff --git a/templates/index.tpl b/templates/index.tpl
index bc6a73fb..d3ba7dca 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -9,6 +9,16 @@
 		{include file='menu.tpl'}
 	{/if}
 {/if}
+<br clear="all" />
+
+{if $authentication_has_role.user && $CONF.motd_user}
+	<div id="motd">{$CONF.motd_user}</div>
+{elseif $authentication_has_role.global_admin && $CONF.motd_superadmin}
+	<div id="motd">{$CONF.motd_superadmin}</div>
+{elseif $authentication_has_role.admin && $CONF.motd_admin}
+	<div id="motd">{$CONF.motd_admin}</div>
+{/if}
+
 {include file='flash_error.tpl'}
 {if $smarty_template}
 	{include file="$smarty_template.tpl"}
diff --git a/templates/menu.tpl b/templates/menu.tpl
index 419755a3..c8ee7f23 100644
--- a/templates/menu.tpl
+++ b/templates/menu.tpl
@@ -81,11 +81,6 @@
 	<li class="logout"><a target="_top" href="{#url_logout#}">{$PALANG.pMenu_logout}</a></li>
 </ul>
 </div>
-{if !empty($motd_file)}
-	<div id="motd">
-	{include file=$motd_file}
-	</div>
-{/if}
 {literal}
 <script type='text/javascript'>
 // <![CDATA[
diff --git a/templates/motd-users.txt b/templates/motd-users.txt
deleted file mode 100644
index cfc667cc..00000000
--- a/templates/motd-users.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="standout">
-=== Announcement ===<br />
-This is a new version of Postfix Admin.<br />
-If you have any questions please direct them to the <a href="mailto:{$CONF.admin_email}">Site Admin</a><br />
-=== Announcement ===<br />
-</div>
-<br />
diff --git a/templates/motd.txt b/templates/motd.txt
deleted file mode 100644
index cfc667cc..00000000
--- a/templates/motd.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="standout">
-=== Announcement ===<br />
-This is a new version of Postfix Admin.<br />
-If you have any questions please direct them to the <a href="mailto:{$CONF.admin_email}">Site Admin</a><br />
-=== Announcement ===<br />
-</div>
-<br />
diff --git a/templates/users_menu.tpl b/templates/users_menu.tpl
index ee1f974f..41d3d816 100644
--- a/templates/users_menu.tpl
+++ b/templates/users_menu.tpl
@@ -9,12 +9,3 @@
 	<li class="logout"><a target="_top" href="{#url_user_logout#}">{$PALANG.pMenu_logout}</a></li>
 </ul>
 </div>
-<br clear="all"/><br/>
-{php}
-if (file_exists (realpath ("../motd-users.txt"))) 
-{
-   print "<div id=\"motd\">\n";
-   include ("../motd-users.txt");
-   print "</div>";
-}
-{/php}