Ensure that the message has a message-id

And ensure that the email address is trimmed to help matching against email
registered for previous tickets.