Messages show/hide fixes