Forward port QuickMessage and Reply

Patchset1 : Fix tabs

Change-Id: I637c5ff0565462564711a3bc260bee4580fd7dc6

Conflicts:

	res/values/strings.xml