MessageFragment tweaks and some cleaning.