Fixes and improvements to quick messages