Message-Id will be null when saving a draft, don't assume it's not.
Regression from !456 (merged)
Fixes #761 (closed)