back to cm7 compose message style
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread