Fixed Messaging & targeting clash

Both did multiple things upon message creation and user update, clashed
with each other as well as themselves with the actions vs the hooks