Fixed From and subject fields themable and consistant with the widget

Shaken not stirred, spaces not tabs.

Change-Id: Id9c2e361ecdf4a3e8cfa0f76cf6b9e7bf1d7548e