Revert back to api 19 / message fragment changes