diff --git a/kmheaders.cpp b/kmheaders.cpp
index d4f2926ea..e04fb269f 100644
--- a/kmheaders.cpp
+++ b/kmheaders.cpp
@@ -70,10 +70,11 @@ QPixmap* KMHeaders::pixFwd = 0;
 QPixmap* KMHeaders::pixFlag = 0;
 QPixmap* KMHeaders::pixFullySigned = 0;
 QPixmap* KMHeaders::pixPartiallySigned = 0;
+QPixmap* KMHeaders::pixUndefinedSigned = 0;
 QPixmap* KMHeaders::pixFullyEncrypted = 0;
 QPixmap* KMHeaders::pixPartiallyEncrypted = 0;
+QPixmap* KMHeaders::pixUndefinedEncrypted = 0;
 QPixmap* KMHeaders::pixFiller = 0;
-QPixmap* KMHeaders::pixUndefined = 0;
 QPixmap* KMHeaders::pixEncryptionProblematic = 0;
 QPixmap* KMHeaders::pixSignatureProblematic = 0;
 
@@ -294,7 +295,7 @@ public:
           else if( mMsgBase->encryptionState() == KMMsgPartiallyEncrypted )
               pixmaps << *KMHeaders::pixPartiallyEncrypted;
           else if( mMsgBase->encryptionState() == KMMsgEncryptionStateUnknown )
-              pixmaps << *KMHeaders::pixUndefined;
+              pixmaps << *KMHeaders::pixUndefinedEncrypted;
           else if( mMsgBase->encryptionState() == KMMsgEncryptionProblematic )
               pixmaps << *KMHeaders::pixEncryptionProblematic;
           else
@@ -305,7 +306,7 @@ public:
           else if( mMsgBase->signatureState() == KMMsgPartiallySigned )
               pixmaps << *KMHeaders::pixPartiallySigned;
           else if( mMsgBase->signatureState() == KMMsgSignatureStateUnknown )
-              pixmaps << *KMHeaders::pixUndefined;
+              pixmaps << *KMHeaders::pixUndefinedSigned;
           else if( mMsgBase->signatureState() == KMMsgSignatureProblematic )
               pixmaps << *KMHeaders::pixSignatureProblematic;
           else
@@ -535,10 +536,11 @@ KMHeaders::KMHeaders(KMMainWin *aOwner, QWidget *parent,
     pixFlag  = new QPixmap( UserIcon("kmmsgflag") );
     pixFullySigned = new QPixmap( UserIcon( "kmmsgfullysigned" ) );
     pixPartiallySigned = new QPixmap( UserIcon( "kmmsgpartiallysigned" ) );
+    pixUndefinedSigned = new QPixmap( UserIcon( "kmmsgundefinedsigned" ) );
     pixFullyEncrypted = new QPixmap( UserIcon( "kmmsgfullyencrypted" ) );
     pixPartiallyEncrypted = new QPixmap( UserIcon( "kmmsgpartiallyencrypted" ) );
+    pixUndefinedEncrypted = new QPixmap( UserIcon( "kmmsgundefinedencrypted" ) );
     pixFiller = new QPixmap( UserIcon( "kmmsgfiller" ) );
-    pixUndefined = new QPixmap( UserIcon( "kmundefined" ) );
     pixEncryptionProblematic = new QPixmap( UserIcon( "kmmsgencryptionproblematic" ) );
     pixSignatureProblematic = new QPixmap( UserIcon( "kmmsgsignatureproblematic" ) );
   }
diff --git a/kmheaders.h b/kmheaders.h
index 33319cc41..451a68f51 100644
--- a/kmheaders.h
+++ b/kmheaders.h
@@ -213,9 +213,9 @@ public slots:
 protected:
   static QPixmap *pixNew, *pixUns, *pixDel, *pixOld, *pixRep, *pixSent,
     *pixQueued, *pixFwd, *pixFlag,
-    *pixFullySigned, *pixPartiallySigned,
-    *pixFullyEncrypted, *pixPartiallyEncrypted,
-      *pixFiller, *pixUndefined, *pixEncryptionProblematic,
+    *pixFullySigned, *pixPartiallySigned, *pixUndefinedSigned,
+    *pixFullyEncrypted, *pixPartiallyEncrypted, *pixUndefinedEncrypted,
+      *pixFiller, *pixEncryptionProblematic,
       *pixSignatureProblematic;
 
   /** Look for color changes */
diff --git a/pics/Makefile.am b/pics/Makefile.am
index 424076080..119181560 100644
--- a/pics/Makefile.am
+++ b/pics/Makefile.am
@@ -5,7 +5,8 @@ data_DATA = kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgold.png \
 	pub_key_red.png pgp-keys.png \
 	kmmsgpartiallyencrypted.png \
 	kmmsgpartiallysigned.png kmmsgfiller.png kmmsgfullyencrypted.png \
-	kmmsgfullysigned.png kmundefined.png kmailwindowlayout1.png \
+	kmmsgfullysigned.png kmmsgundefinedencrypted.png \
+	kmmsgundefinedsigned.png kmailwindowlayout1.png \
 	kmailwindowlayout2.png kmailwindowlayout3.png kmailwindowlayout4.png \
 	kmailwindowlayout5.png kmailwindowlayout1_smart_mime.png \
 	kmailwindowlayout2_smart_mime.png kmailwindowlayout3_smart_mime.png \
diff --git a/pics/kmmsgundefinedencrypted.png b/pics/kmmsgundefinedencrypted.png
new file mode 100644
index 000000000..e7e555a0b
Binary files /dev/null and b/pics/kmmsgundefinedencrypted.png differ
diff --git a/pics/kmmsgundefinedsigned.png b/pics/kmmsgundefinedsigned.png
new file mode 100644
index 000000000..2699cd0fa
Binary files /dev/null and b/pics/kmmsgundefinedsigned.png differ