Bug 845064 - Compose Message Screen Updates
Merge pull request #8960 from pivanov/bug-845064

Bug 845064 - Compose Message Screen Updates