pull in MessageBeast-Android changes