--- t-prot	2006-06-18 00:45:55.000000000 +0200
+++ t-prot-M1511	2006-07-11 14:22:56.000000000 +0200
@@ -32,7 +32,7 @@
 
     $mutt_attachment $mutt_contenttype $mutt_pgpsigned $mutt_beginsigned
     $mutt_pgpclearsigned $mutt_pgpclearsigstart $mutt_pgpencrypted
-    $mutt_pgpoutstart $mutt_pgpoutend
+    $mutt_pgpoutstart $mutt_pgpoutend $mutt_ssloutstart $mutt_ssloutend
 );
 
 
@@ -69,6 +69,8 @@
 $mutt_pgpencrypted      = '[-- End of PGP/MIME encrypted data --]';
 $mutt_pgpoutstart       = '[-- PGP output follows (current time:';
 $mutt_pgpoutend         = '[-- End of PGP output --]';
+$mutt_ssloutstart       = '[-- OpenSSL output follows';
+$mutt_ssloutend         = '[-- End of OpenSSL output --]';
 
 # set the defaults to the C locale
 $gpg_WARNING            = 'WARNING: ';
@@ -336,7 +338,7 @@
     for (my $x=0; $x<scalar(@$L); $x++) {
         if ($$V[$x]) { next; }
 
-        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
+        if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E|\Q$mutt_ssloutstart\E)/o)
         {
             my $from;
             for (my $m=0; $m<scalar(@$H); $m++) {
@@ -363,7 +365,7 @@
                     splice(@$V, $i, 1);
                     $i--;
                 }
-                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o)
+                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E|\Q$mutt_ssloutend\E)/o)
                 {
                     if ($pgpmove ||
                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
@@ -693,7 +695,7 @@
                     'Forwarded message',
                     'Weitergeleitete Nachricht / Forwarded Message');
         my $k = 0;    # any text above?
-        my $tmp = 0;  # flagged if inside PGP output
+        my $tmp = 0;  # flagged if inside PGP or SSL output
 
         DONE: for ($x=0; $x<scalar(@$lines); $x++) { 
             if (!$vrb[$x]) {
@@ -716,9 +718,11 @@
                     ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
                 {
                     if ($mua eq 'mutt' && (!$tmp) &&
-                        $$lines[$x] =~
-                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
-                        $tmp = 1; 
+                        ($$lines[$x] =~
+                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o ||
+                         $$lines[$x] =~
+                             /^(?:\e[^\a]+\a)?(?:\Q$mutt_ssloutstart\E)/o)) {
+                        $tmp = 1;
                     } elsif ($mua eq 'mutt' && $tmp && 
                         ($$lines[$x] =~
                              /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
@@ -989,8 +993,8 @@
                 Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
                 m/^([^%]*)/;
             ($mutt_pgpsigned) =
-                Locale::gettext::gettext("[-- End of signed data --]\n")  =~
-                m/^(.*)\n/m;
+                Locale::gettext::gettext("\n[-- End of signed data --]\n")  =~
+                m/^\n*(.*)\n/m;
             ($mutt_beginsigned) =
                 Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
                 m/^(.*)\n/m;
@@ -998,16 +1002,24 @@
                 Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
                 m/^(.*)\n/m;
             ($mutt_pgpclearsigstart) =
-                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
+                Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n\n") =~
                 m/^(.*)\n/m;
             ($mutt_pgpencrypted) =
                 Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
                 m/^(.*)\n/m;
             ($mutt_pgpoutstart) =
-                Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
-                m/^([^%]*)/;
+                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
+                m/^(.*)%s/;
+            $mutt_pgpoutstart =~ s/%s/PGP/;
             ($mutt_pgpoutend) =
-                Locale::gettext::gettext("[-- End of PGP output --]\n") =~
+                Locale::gettext::gettext("[-- End of PGP output --]\n\n") =~
+                m/^(.*)\n/m;
+            ($mutt_ssloutstart) =
+                Locale::gettext::gettext("[-- %s output follows%s --]\n") =~
+                m/^(.*)%s/;
+            $mutt_ssloutstart =~ s/%s/OpenSSL/;
+            ($mutt_ssloutend) =
+                Locale::gettext::gettext("[-- End of OpenSSL output --]\n\n") =~
                 m/^(.*)\n/m;
 
             Locale::gettext::textdomain('gnupg');