now generate messageid if none given
Merge branch 'master' into jupis