Reverted last changes to hooking and added new hooking function
Fixes to quick messages