diff --git a/mozilla/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.js b/mozilla/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.js
index c352b110b15..fe025260da1 100644
--- a/mozilla/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.js
+++ b/mozilla/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.js
@@ -129,15 +129,15 @@ function onSMIMEStartHeaders()
   gEncryptionCert = null;
   
   gSMIMEContainer.collapsed = true;
+
   gSignedUINode.collapsed = true;
   gSignedUINode.removeAttribute("signed");
-  gStatusBar.removeAttribute("signed");
-
   gSignedStatusPanel.collapsed = true;
-  gEncryptedStatusPanel.collapsed = true; 
+  gStatusBar.removeAttribute("signed");
 
   gEncryptedUINode.collapsed = true;
   gEncryptedUINode.removeAttribute("encrypted");
+  gEncryptedStatusPanel.collapsed = true; 
   gStatusBar.removeAttribute("encrypted");
 
   forgetEncryptedURI();
diff --git a/mozilla/themes/classic/messenger/smime/msgReadSMIMEOverlay.css b/mozilla/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
index 400b233e7d8..9628baa17f2 100644
--- a/mozilla/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
+++ b/mozilla/themes/classic/messenger/smime/msgReadSMIMEOverlay.css
@@ -40,35 +40,28 @@
 
 #status-bar #signed-status {
   list-style-image: none;
-  visibility: collapsed;
 }
 
 #status-bar[signed="ok"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.gif");
-  visibility: visible;
 }
 
 #status-bar[signed="unknown"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.gif");
-  visibility: visible;
 }
 
 #status-bar[signed="notok"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.gif");
-  visibility: visible;
 }
 
 #status-bar #encrypted-status {
   list-style-image: none;
-  visibility: collapsed;
 }
 
 #status-bar[encrypted="ok"] #encrypted-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.gif");
-  visibility: visible;
 }
 
 #status-bar[encrypted="notok"] #encrypted-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.gif");
-  visibility: visible;
 }
diff --git a/mozilla/themes/modern/messenger/smime/msgReadSMIMEOverlay.css b/mozilla/themes/modern/messenger/smime/msgReadSMIMEOverlay.css
index 9c158f67aaf..9628baa17f2 100644
--- a/mozilla/themes/modern/messenger/smime/msgReadSMIMEOverlay.css
+++ b/mozilla/themes/modern/messenger/smime/msgReadSMIMEOverlay.css
@@ -39,34 +39,29 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #status-bar #signed-status {
-  visibility: collapsed;
+  list-style-image: none;
 }
 
 #status-bar[signed="ok"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.gif");
-  visibility: visible;
 }
 
 #status-bar[signed="unknown"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.gif");
-  visibility: visible;
 }
 
 #status-bar[signed="notok"] #signed-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.gif");
-  visibility: visible;
 }
 
 #status-bar #encrypted-status {
-  visibility: collapsed;
+  list-style-image: none;
 }
 
 #status-bar[encrypted="ok"] #encrypted-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.gif");
-  visibility: visible;
 }
 
 #status-bar[encrypted="notok"] #encrypted-status {
   list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.gif");
-  visibility: visible;
 }