broken message_id...

Change-Id: I37eee7aa4e6ff7cc111dacedb20fd1e7e075ac17