Fix bug in how handlers are called

Conflicts:
	build/js/messenger.min.js