MessageService for Android fix