Fixed SendMessage Bug

FINALLY
UI Fixes
Merge branch 'master' into instant

Conflicts:
	res/values/strings.xml