diff --git a/common/usr/share/MailScanner/perl/MailScanner/MSMail.pm b/common/usr/share/MailScanner/perl/MailScanner/MSMail.pm
index 977f6e5..ebbff9a 100644
--- a/common/usr/share/MailScanner/perl/MailScanner/MSMail.pm
+++ b/common/usr/share/MailScanner/perl/MailScanner/MSMail.pm
@@ -481,7 +481,9 @@ sub new {
                 }
                 $InTo=0;
              }
-         } elsif ($recdata =~ m/^To: /i) {
+         }
+
+         if ($recdata =~ m/^To: /i) {
             # RFC 822 unfold address field
             $UnfoldBuffer = $recdata;
             $InTo = 1;