Author: Jochen Striepe
Description: two patches pulled from upstream:
  * t-prot: Fix eYou Webmail Tofu.
  * t-prot: Fix text/plain content-type detection with several user
    agents.

Index: b/t-prot
===================================================================
--- a/t-prot
+++ b/t-prot
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.312 2010/10/31 11:18:15 jochen Exp $
+# $Id: t-prot,v 1.314 2012/01/19 14:56:16 jochen Exp $
 
 require 5.006;
 use strict;
@@ -7,7 +7,7 @@ use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Long qw(:config gnu_getopt no_ignore_case);
 use constant VER            => '2.101';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.312 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.314 $=~m/(\d+(?:\.\d+)+)/;
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
@@ -564,7 +564,7 @@ sub process_msg {
                             }
                             if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
 
-                            if ($bar =~ m!^text/plain!) {
+                            if ($bar =~ m!^text/plain!i) {
                                 my $z;
                                 for ($z=1; $x+$z<@$lines; $z++) {
                                     if (index($$lines[$x+$z], '--'.$foo)==0) {
@@ -659,7 +659,7 @@ sub process_msg {
                             (?:\e[^\a]+\a)?
                             (?:\Q$mutt_contenttype\E)
                             (?:text/plain|application/pgp)
-                        !ox))) ||
+                        !oxi))) ||
                 ($$lines[$x] =~ /^
                     (?:\e[^\a]+\a)?
                     (?:\Q$mutt_pgpsigned\E     |
@@ -800,6 +800,7 @@ sub process_msg {
                     'Ursprungligt meddelande',
                     'Oorspronkelijk bericht',
                     'Message d\'origine',
+                    'Origin message',
                     'Forwarded message',
                     'Weitergeleitete Nachricht / Forwarded Message',
                     '[A-Za-z ]+ <(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})> schrieb:');