Fix a bunch orientation related issues.

Restore contents of message from bundle on orientation changes
We don't care about whats in the draft, since it may not be done
saving yet anyway

Change-Id: I51ef0324fa871b3624c16e24e60d43c92f9ef5a0
5 files changed