diff --git a/forms/Makefile.am b/forms/Makefile.am
index d5d4fd1..2dea35d 100644
--- a/forms/Makefile.am
+++ b/forms/Makefile.am
@@ -1,21 +1,22 @@
 # forms - Automake template
 # Copyright (C) 2008 g10 Code GmbH
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ## Process this file with automake to produce Makefile.in
 
-icons = encr-l.ico encr-s.ico sign-l.ico sign-s.ico
+icons = encr-l.ico encr-s.ico sign-l.ico sign-s.ico \
+		sign-s-smime.ico encr-s-smime.ico
 
 cfg = gpgol.cfg gpgol-ms.cfg gpgol-cs.cfg \
 	  gpgol-form-signed.cfg gpgol-form-encrypted.cfg
 
 dist_pkgdata_DATA = $(icons) $(cfg)
 
-EXTRA_DIST=encr-s.xcf ribbon.xcf
+EXTRA_DIST=encr-s.xcf ribbon.xcf encr-s-yellow.xcf ribbon-red.xcf
diff --git a/forms/encr-s-smime.ico b/forms/encr-s-smime.ico
new file mode 100644
index 0000000..1860f1e
Binary files /dev/null and b/forms/encr-s-smime.ico differ
diff --git a/forms/encr-s-yellow.xcf b/forms/encr-s-yellow.xcf
new file mode 100644
index 0000000..46d5b1d
Binary files /dev/null and b/forms/encr-s-yellow.xcf differ
diff --git a/forms/gpgol-form-encrypted-smime.cfg b/forms/gpgol-form-encrypted-smime.cfg
new file mode 100644
index 0000000..e064fbb
--- /dev/null
+++ b/forms/gpgol-form-encrypted-smime.cfg
@@ -0,0 +1,34 @@
+[Description]
+MessageClass=IPM.Note.GpgOL.OpaqueEncrypted
+DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
+CLSID={00061033-0000-0000-C000-000000000046}
+DisplayName=Form for encrypted SMIME Mails in GpgOL
+Category=Standard
+Subcategory=Formular
+Comment=
+LargeIcon=encr-l.ico
+SmallIcon=encr-s-smime.ico
+VersionMajor=1
+VersionMinor=0
+Hidden=1
+Owner=Public Domain
+
+[Properties]
+
+[Verbs]
+Verb1=1
+
+[Verb.1]
+DisplayName=&Open
+Code=0
+Flags=0
+Attribs=2
+
+[Extensions]
+Extensions1=1
+
+[Extension.1]
+Type=30
+NmidPropset={00020D0C-0000-0000-C000-000000000046}
+NmidInteger=1
+Value=1011111111111111
diff --git a/forms/gpgol-form-signed-smime-opaque.cfg b/forms/gpgol-form-signed-smime-opaque.cfg
new file mode 100644
index 0000000..bcff769
--- /dev/null
+++ b/forms/gpgol-form-signed-smime-opaque.cfg
@@ -0,0 +1,34 @@
+[Description]
+MessageClass=IPM.Note.GpgOL.OpaqueSigned
+DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
+CLSID={00061033-0000-0000-C000-000000000046}
+DisplayName=Form for signed S/MIME Mails in GpgOL
+Category=Standard
+Subcategory=Formular
+Comment=
+LargeIcon=sign-l.ico
+SmallIcon=sign-s-smime.ico
+VersionMajor=1
+VersionMinor=0
+Hidden=1
+Owner=Public Domain
+
+[Properties]
+
+[Verbs]
+Verb1=1
+
+[Verb.1]
+DisplayName=&Open
+Code=0
+Flags=0
+Attribs=2
+
+[Extensions]
+Extensions1=1
+
+[Extension.1]
+Type=30
+NmidPropset={00020D0C-0000-0000-C000-000000000046}
+NmidInteger=1
+Value=1011111111111111
diff --git a/forms/gpgol-form-signed-smime.cfg b/forms/gpgol-form-signed-smime.cfg
new file mode 100644
index 0000000..8dd76ad
--- /dev/null
+++ b/forms/gpgol-form-signed-smime.cfg
@@ -0,0 +1,34 @@
+[Description]
+MessageClass=IPM.Note.GpgOL.SM.MultipartSigned
+DesignerRuntimeGuid={0006F020-0000-0000-C000-000000000046}
+CLSID={00061033-0000-0000-C000-000000000046}
+DisplayName=Form for signed S/MIME Mails in GpgOL
+Category=Standard
+Subcategory=Formular
+Comment=
+LargeIcon=sign-l.ico
+SmallIcon=sign-s-smime.ico
+VersionMajor=1
+VersionMinor=0
+Hidden=1
+Owner=Public Domain
+
+[Properties]
+
+[Verbs]
+Verb1=1
+
+[Verb.1]
+DisplayName=&Open
+Code=0
+Flags=0
+Attribs=2
+
+[Extensions]
+Extensions1=1
+
+[Extension.1]
+Type=30
+NmidPropset={00020D0C-0000-0000-C000-000000000046}
+NmidInteger=1
+Value=1011111111111111
diff --git a/forms/ribbon-red.xcf b/forms/ribbon-red.xcf
new file mode 100644
index 0000000..eee08a7
Binary files /dev/null and b/forms/ribbon-red.xcf differ
diff --git a/forms/sign-s-smime.ico b/forms/sign-s-smime.ico
new file mode 100644
index 0000000..1daedc9
Binary files /dev/null and b/forms/sign-s-smime.ico differ