--- lib/Razor2/Preproc/deBase64.pm	2002-06-06 04:51:24.000000000 +0100
+++ lib/Razor2/Preproc/deBase64.pm	2007-01-26 13:38:06.000000000 +0000
@@ -36,8 +36,9 @@
 sub extract_base64 {
     my ($self, $text) = @_;
 
-    if ($$text =~ /Content-Transfer-Encoding: base64/si) {
-        $' =~ /\r?\n\r?\n([^=]*)/s;  # match to end of data or '='
+    if ($$text =~ /Content-Transfer-Encoding: base64(.*)$/si) {
+        my $rhs = $1;
+        $rhs =~ /\r?\n\r?\n([^=]*)/s;  # match to end of data or '='
         return $1 . "==";
     }
     return undef;
diff -ru lib.OLD/Razor2/Preproc/deQP.pm lib/Razor2/Preproc/deQP.pm
--- lib/Razor2/Preproc/deQP.pm	2002-07-25 23:45:08.000000000 +0100
+++ lib/Razor2/Preproc/deQP.pm	2007-01-26 13:37:38.000000000 +0000
@@ -34,8 +34,9 @@
 sub extract_qp {
     my ($self, $text) = @_;
 
-    if ($$text =~ /Content-Transfer-Encoding: quoted-printable/sim) {
-        $' =~ /\r?\n\r?\n(.*)$/s;
+    if ($$text =~ /Content-Transfer-Encoding: quoted-printable(.*)$/sim) {
+        my $rhs = $1;
+        $rhs =~ /\r?\n\r?\n(.*)$/s;
         return $1;
     }
     return undef;
--- lib/Razor2/Signature/Whiplash.pm.orig	Tue Feb 20 19:50:35 2007
+++ lib/Razor2/Signature/Whiplash.pm	Tue Feb 20 19:50:36 2007
@@ -789,8 +789,8 @@
             }
         }
 
-        last unless $text =~ m"http://";
-        $text = $';
+        last unless $text =~ m"http://(.*)$";
+        $text = $1;
 
     }