Make this a bit clearer
Re-fix header
Message-IDs might be missing, so need to catch/ignore that issue
Bug #13463: Possible fix