1 files changed, 13 insertions, 0 deletions
diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm
index d0dd82fb..e0127ab9 100644
--- a/lib/PublicInbox/MsgIter.pm
+++ b/lib/PublicInbox/MsgIter.pm
@@ -6,6 +6,16 @@ use strict;
  use warnings;
  use base qw(Exporter);
  our @EXPORT = qw(msg_iter);
+use Email::MIME;
+
+# Workaround Email::MIME versions without
+# commit dcef9be66c49ae89c7a5027a789bbbac544499ce
+# ("removing all trailing newlines was too much")
+# This is necessary for Debian jessie
+my $bad = 1.923;
+my $good = 1.935;
+my $ver = $Email::MIME::VERSION;
+my $extra_nl = 1 if ($ver >= $bad && $ver < $good);
  
  # Like Email::MIME::walk_parts, but this is:
  # * non-recursive
@@ -25,6 +35,9 @@ sub msg_iter ($$) {
                                  @sub = map { [ $_, $depth, @idx, ++$i ] } @sub;
                                  @parts = (@sub, @parts);
                          } else {
+                                if ($extra_nl) {
+                                        ${$part->{body}} .= $part->{mycrlf};
+                                }
                                  $cb->($p);
                          }
                  }