Backport improved message-ID generation code from DEVEL
(less complex, reduces problems with any of the fields missing
or containing message-ID-invalid data)