Android Fixes for 3.2.0 and allow message to be modified while displayed