--- amavisd.original        2008-12-15 01:50:09.000000000 +0100
+++ amavisd     2009-01-20 22:31:46.000000000 +0100
@@ -19179,5 +19179,5 @@
      }
      my($m_id) = $msginfo->get_header_field_body('message-id');
-      $m_id = parse_message_id($m_id) if $m_id ne ''; # strip CFWS, take #1
+      $m_id = join(' ',parse_message_id($m_id))  if $m_id ne '';  # strip CFWS
      my($subj) = $msginfo->get_header_field_body('subject');
      my($from) = $msginfo->get_header_field_body('from');  # raw full field