diff --git a/webui/view/theme/default/templates/message/headers.tpl b/webui/view/theme/default/templates/message/headers.tpl
index dd78f13..647545e 100644
--- a/webui/view/theme/default/templates/message/headers.tpl
+++ b/webui/view/theme/default/templates/message/headers.tpl
@@ -14,11 +14,11 @@
 
 <p>
    <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><i class="icon-cloud-download"></i>&nbsp;<?php print $text_download_message; ?></a> |
-<?php if(Registry::get('auditor_user') == 1) { ?>
+<?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
    <a class="messagelink" href="#" onclick="$('#restorebox').show();"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
 <?php } else { ?>
    <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
-<?php } ?>
+<?php } } ?>
    <a class="messagelink" href="#" onclick="Piler.view_message(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_message; ?></a>
 <?php if($message['has_journal'] == 1 && Registry::get('auditor_user') == 1 && SHOW_ENVELOPE_JOURNAL == 1) { ?>
    | <a class="messagelink" href="#" onclick="Piler.view_journal(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_journal_envelope; ?></a>
diff --git a/webui/view/theme/default/templates/message/journal.tpl b/webui/view/theme/default/templates/message/journal.tpl
index 9c4984d..55db1d3 100644
--- a/webui/view/theme/default/templates/message/journal.tpl
+++ b/webui/view/theme/default/templates/message/journal.tpl
@@ -14,11 +14,11 @@
 
 <p>
    <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><i class="icon-cloud-download"></i>&nbsp;<?php print $text_download_message; ?></a> |
-<?php if(Registry::get('auditor_user') == 1) { ?>
+<?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
    <a class="messagelink" href="#" onclick="$('#restorebox').show();"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
 <?php } else { ?>
    <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
-<?php } ?>
+<?php } } ?>
    <a class="messagelink" href="#" onclick="Piler.view_headers(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_headers; ?></a>
    <a class="messagelink" href="#" onclick="Piler.view_message(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_message; ?></a>
 
diff --git a/webui/view/theme/default/templates/message/view.tpl b/webui/view/theme/default/templates/message/view.tpl
index ec54a66..984bb03 100644
--- a/webui/view/theme/default/templates/message/view.tpl
+++ b/webui/view/theme/default/templates/message/view.tpl
@@ -14,11 +14,11 @@
 
     <p>
        <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><i class="icon-cloud-download"></i>&nbsp;<?php print $text_download_message; ?></a> |
-    <?php if(Registry::get('auditor_user') == 1) { ?>
+    <?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
        <a class="messagelink" href="#" onclick="$('#restorebox').show();"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
     <?php } else { ?>
        <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><i class="icon-reply"></i>&nbsp;<?php print $text_restore_to_mailbox; ?></a> |
-    <?php } ?>
+    <?php } } ?>
        <a class="messagelink" href="#" onclick="Piler.view_headers(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_headers; ?></a>
     <?php if($message['has_journal'] == 1 && Registry::get('auditor_user') == 1 && SHOW_ENVELOPE_JOURNAL == 1) { ?>
        | <a class="messagelink" href="#" onclick="Piler.view_journal(<?php print $id; ?>);"><i class="icon-envelope-alt"></i>&nbsp;<?php print $text_view_journal_envelope; ?></a>
diff --git a/webui/view/theme/mobile/templates/message/headers.tpl b/webui/view/theme/mobile/templates/message/headers.tpl
index 4451fb8..1cb9287 100644
--- a/webui/view/theme/mobile/templates/message/headers.tpl
+++ b/webui/view/theme/mobile/templates/message/headers.tpl
@@ -12,11 +12,11 @@
 
 <p>
    <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
-<?php if(Registry::get('auditor_user') == 1) { ?>
+<?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
    <a class="messagelink" href="#" onclick="$('#restorebox').show();"><?php print $text_restore_to_mailbox; ?></a> |
 <?php } else { ?>
    <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><?php print $text_restore_to_mailbox; ?></a> |
-<?php } ?>
+<?php } } ?>
    <a class="messagelink" href="#" onclick="Piler.view_message(<?php print $id; ?>);"><?php print $text_view_message; ?></a>
 <?php if($message['has_journal'] == 1 && Registry::get('auditor_user') == 1 && SHOW_ENVELOPE_JOURNAL == 1) { ?>
    | <a class="messagelink" href="#" onclick="Piler.view_journal(<?php print $id; ?>);"><i class="icon-envelope"></i>&nbsp;<?php print $text_view_journal_envelope; ?></a>
diff --git a/webui/view/theme/mobile/templates/message/journal.tpl b/webui/view/theme/mobile/templates/message/journal.tpl
index cc46a85..034f68b 100644
--- a/webui/view/theme/mobile/templates/message/journal.tpl
+++ b/webui/view/theme/mobile/templates/message/journal.tpl
@@ -12,11 +12,11 @@
 
 <p>
    <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
-<?php if(Registry::get('auditor_user') == 1) { ?>
+<?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
    <a class="messagelink" href="#" onclick="$('#restorebox').show();"><?php print $text_restore_to_mailbox; ?></a> |
 <?php } else { ?>
    <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><?php print $text_restore_to_mailbox; ?></a> |
-<?php } ?>
+<?php } } ?>
    <a class="messagelink" href="#" onclick="Piler.view_headers(<?php print $id; ?>);"><?php print $text_view_headers; ?></a> |
    <a class="messagelink" href="#" onclick="Piler.view_message(<?php print $id; ?>);"><?php print $text_view_message; ?></a>
 </p>
diff --git a/webui/view/theme/mobile/templates/message/view.tpl b/webui/view/theme/mobile/templates/message/view.tpl
index 49b8d52..f3e890a 100644
--- a/webui/view/theme/mobile/templates/message/view.tpl
+++ b/webui/view/theme/mobile/templates/message/view.tpl
@@ -12,11 +12,11 @@
 
 <p>
    <a class="messagelink" href="index.php?route=message/download&amp;id=<?php print $id; ?>"><?php print $text_download_message; ?></a> |
-<?php if(Registry::get('auditor_user') == 1) { ?>
+<?php if(SMARTHOST) { if(Registry::get('auditor_user') == 1) { ?>
    <a class="messagelink" href="#" onclick="$('#restorebox').show();"><?php print $text_restore_to_mailbox; ?></a> |
 <?php } else { ?>
    <a class="messagelink" href="#" onclick="Piler.restore_message(<?php print $id; ?>);"><?php print $text_restore_to_mailbox; ?></a> |
-<?php } ?>
+<?php } } ?>
    <a class="messagelink" href="#" onclick="Piler.view_headers(<?php print $id; ?>);"><?php print $text_view_headers; ?></a>
 <?php if($message['has_journal'] == 1 && Registry::get('auditor_user') == 1 && SHOW_ENVELOPE_JOURNAL == 1) { ?>
    | <a class="messagelink" href="#" onclick="Piler.view_journal(<?php print $id; ?>);"><i class="icon-envelope"></i>&nbsp;<?php print $text_view_journal_envelope; ?></a>