add traces
some messages do not have a MessageID-header. our internal messageid is more important (and therefore does not have to be the same)
better handling if no message-id set
Merge branch 'master' into jupis