message id tweaks. fixing #27