--- /usr/share/perl5/Mail/SpamAssassin/Plugin/SPF.pm	2011-06-07 01:59:17.000000000 +0200
+++ SPF.pm	2015-07-16 18:48:32.000000000 +0200
@@ -323,7 +323,9 @@
     $scanner->{checked_for_received_spf_header} = 1;
     dbg("spf: checking to see if the message has a Received-SPF header that we can use");
 
-    my @internal_hdrs = split("\n", $scanner->get('ALL-INTERNAL'));
+    my $internal_hdrs = $scanner->get('ALL-INTERNAL');
+    $internal_hdrs =~ s/\n\n\s+/ /sg;
+    my @internal_hdrs = split("\n\n", $internal_hdrs);
     unless ($scanner->{conf}->{use_newest_received_spf_header}) {
       # look for the LAST (earliest in time) header, it'll be the most accurate
       @internal_hdrs = reverse(@internal_hdrs);