Follow notmuch behavior if Message-ID header does not follow spec

Change-Id: I536b59560463c958fa40bc76df2878421f1bca48