diff --git a/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java b/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
index 45ee09808..30c343c95 100644
--- a/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
+++ b/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
@@ -1,211 +1,213 @@
 package app.comm.android.notifications;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 import androidx.core.app.NotificationCompat;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import app.comm.android.ExpoUtils;
 import app.comm.android.R;
 import app.comm.android.fbjni.CommSecureStore;
 import app.comm.android.fbjni.GlobalDBSingleton;
 import app.comm.android.fbjni.MessageOperationsUtilities;
 import app.comm.android.fbjni.NetworkModule;
 import app.comm.android.fbjni.ThreadOperations;
 import com.google.firebase.messaging.RemoteMessage;
 import io.invertase.firebase.messaging.RNFirebaseMessagingService;
 import java.io.File;
 import me.leolin.shortcutbadger.ShortcutBadger;
 
 /**
  * We're extending RNFirebaseMessagingService here instead of
  * FirebaseMessagingService which is not ideal but let's us work around an
  * Android limitation. If there are a couple of FirebaseMessagingServices
  * declared in manifest, only the first one would get all the notifications.
  * So we need to find a way to have only one service that implements this.
  *
  * There are a couple of solutions here:
  * 1. We could have both services declared and only one of them would handle
  * the intents. Then it would check the intent and forward it to
  * another service. This solution is problematic as the second service would
  * need to listen for a different set of intents that effectively duplicate
  * all the notifications intents.
  * 2. We can instantiate RNFirebaseMessagingService here and call its callbacks
  * which sounds like a good solution. But then, some mechanisms would not work
  * correctly, e.g. we would need to somehow take care of the Context.
  * 3. This solution, in which we extend RNFirebaseMessagingService, would
  * consist of implementing the callbacks and either handling them or calling
  * super methods. In near future we plan to get rid of
  * RNFirebaseMessagingService and at that point super methods will no longer be
  * called and this class could start implementing FirebaseMessagingService.
  *
  * There's nothing that makes 1st and 2nd solution impossible, but 3rd one is
  * the easiest in terms of making it safe.
  */
 public class CommNotificationsHandler extends RNFirebaseMessagingService {
   private static final String BADGE_KEY = "badge";
   private static final String BADGE_ONLY_KEY = "badgeOnly";
   private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
   private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
   private static final String NOTIF_ID_KEY = "id";
 
   private static final String CHANNEL_ID = "default";
   private static final long[] VIBRATION_SPEC = {500, 500};
   private Bitmap displayableNotificationLargeIcon;
   private NotificationManager notificationManager;
   private LocalBroadcastManager localBroadcastManager;
 
   public static final String RESCIND_KEY = "rescind";
   public static final String RESCIND_ID_KEY = "rescindID";
   public static final String TITLE_KEY = "title";
   public static final String PREFIX_KEY = "prefix";
   public static final String BODY_KEY = "body";
   public static final String MESSAGE_INFOS_KEY = "messageInfos";
   public static final String THREAD_ID_KEY = "threadID";
 
   public static final String TOKEN_EVENT = "TOKEN_EVENT";
   public static final String FOREGROUND_MESSAGE_EVENT =
       "FOREGROUND_MESSAGE_EVENT";
 
   @Override
   public void onCreate() {
     super.onCreate();
     CommSecureStore.getInstance().initialize(
         ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
     notificationManager = (NotificationManager)this.getSystemService(
         Context.NOTIFICATION_SERVICE);
     localBroadcastManager = LocalBroadcastManager.getInstance(this);
     displayableNotificationLargeIcon = BitmapFactory.decodeResource(
         this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
   }
 
   @Override
   public void onNewToken(String token) {
     Intent intent = new Intent(TOKEN_EVENT);
     intent.putExtra("token", token);
     localBroadcastManager.sendBroadcast(intent);
   }
 
   @Override
   public void onMessageReceived(RemoteMessage message) {
     String rescind = message.getData().get(RESCIND_KEY);
     if ("true".equals(rescind) &&
         android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
       handleNotificationRescind(message);
     }
 
     String badge = message.getData().get(BADGE_KEY);
     if (badge != null) {
       try {
         int badgeCount = Integer.parseInt(badge);
         if (badgeCount > 0) {
           ShortcutBadger.applyCount(this, badgeCount);
         } else {
           ShortcutBadger.removeCount(this);
         }
       } catch (NumberFormatException e) {
         Log.w("COMM", "Invalid badge count", e);
       }
     }
 
     String badgeOnly = message.getData().get(BADGE_ONLY_KEY);
     if ("1".equals(badgeOnly)) {
       return;
     }
 
     String backgroundNotifType =
         message.getData().get(BACKGROUND_NOTIF_TYPE_KEY);
 
     String rawMessageInfosString = message.getData().get(MESSAGE_INFOS_KEY);
     File sqliteFile =
         this.getApplicationContext().getDatabasePath("comm.sqlite");
     if (rawMessageInfosString != null && sqliteFile.exists()) {
       GlobalDBSingleton.scheduleOrRun(() -> {
         MessageOperationsUtilities.storeMessageInfos(
             sqliteFile.getPath(), rawMessageInfosString);
       });
     } else if (rawMessageInfosString != null) {
       Log.w("COMM", "Database not existing yet. Skipping notification");
     }
 
     if (this.isAppInForeground()) {
-      super.onMessageReceived(message);
+      Intent intent = new Intent(FOREGROUND_MESSAGE_EVENT);
+      intent.putExtra("message", message);
+      localBroadcastManager.sendBroadcast(intent);
       return;
     }
     this.displayNotification(message);
   }
 
   private boolean isAppInForeground() {
     return ProcessLifecycleOwner.get().getLifecycle().getCurrentState() ==
         Lifecycle.State.RESUMED;
   }
 
   private void handleNotificationRescind(RemoteMessage message) {
     String setUnreadStatus = message.getData().get(SET_UNREAD_STATUS_KEY);
     if ("true".equals(setUnreadStatus)) {
       File sqliteFile =
           this.getApplicationContext().getDatabasePath("comm.sqlite");
       if (sqliteFile.exists()) {
         String threadID = message.getData().get(THREAD_ID_KEY);
         GlobalDBSingleton.scheduleOrRun(() -> {
           ThreadOperations.updateSQLiteUnreadStatus(
               sqliteFile.getPath(), threadID, false);
         });
       } else {
         Log.w(
             "COMM",
             "Database not existing yet. Skipping thread status update.");
       }
     }
     String rescindID = message.getData().get(RESCIND_ID_KEY);
     for (StatusBarNotification notification :
          notificationManager.getActiveNotifications()) {
       String tag = notification.getTag();
       if (tag != null && tag.equals(rescindID)) {
         notificationManager.cancel(notification.getTag(), notification.getId());
       }
     }
   }
 
   private void displayNotification(RemoteMessage message) {
     if (message.getData().get(RESCIND_KEY) != null) {
       // don't attempt to display rescinds
       return;
     }
     String id = message.getData().get(NOTIF_ID_KEY);
     String title = message.getData().get(TITLE_KEY);
     String prefix = message.getData().get(PREFIX_KEY);
     String body = message.getData().get(BODY_KEY);
     String threadID = message.getData().get(THREAD_ID_KEY);
 
     if (prefix != null) {
       body = prefix + " " + body;
     }
 
     Bundle data = new Bundle();
     data.putString(THREAD_ID_KEY, threadID);
 
     NotificationCompat.Builder notificationBuilder =
         new NotificationCompat.Builder(this.getApplicationContext())
             .setDefaults(Notification.DEFAULT_ALL)
             .setContentText(body)
             .setExtras(data)
             .setChannelId(CHANNEL_ID)
             .setVibrate(VIBRATION_SPEC)
             .setSmallIcon(R.drawable.notif_icon)
             .setLargeIcon(displayableNotificationLargeIcon)
             .setAutoCancel(true);
     if (title != null) {
       notificationBuilder = notificationBuilder.setContentTitle(title);
     }
     notificationManager.notify(id, id.hashCode(), notificationBuilder.build());
   }
 }
diff --git a/native/push/android.js b/native/push/android.js
index 54b06589d..b3609d763 100644
--- a/native/push/android.js
+++ b/native/push/android.js
@@ -1,58 +1,57 @@
 // @flow
 
-import invariant from 'invariant';
 import { NativeModules, NativeEventEmitter } from 'react-native';
-import type { RemoteMessage } from 'react-native-firebase';
 
 import { mergePrefixIntoBody } from 'lib/shared/notif-utils';
 
 type CommAndroidNotificationsModuleType = {
   +removeAllActiveNotificationsForThread: (threadID: string) => void,
   ...
 };
+export type AndroidForegroundMessage = {
+  +body: string,
+  +title: string,
+  +threadID: string,
+  +prefix?: string,
+  +messageInfos: ?string,
+};
 
 const { CommAndroidNotificationsEventEmitter } = NativeModules;
 const CommAndroidNotifications: CommAndroidNotificationsModuleType =
   NativeModules.CommAndroidNotifications;
 const androidNotificationChannelID = 'default';
 
 function handleAndroidMessage(
-  message: RemoteMessage,
+  message: AndroidForegroundMessage,
   updatesCurrentAsOf: number,
   handleIfActive?: (
     threadID: string,
     texts: { body: string, title: ?string },
   ) => boolean,
 ) {
-  const { data } = message;
-
-  const { rescind, rescindID } = data;
-  if (rescind) {
-    invariant(rescindID, 'rescind message without notifID');
-    return;
-  }
-
-  const { title, prefix, threadID } = data;
-  let { body } = data;
+  const { title, prefix, threadID } = message;
+  let { body } = message;
   ({ body } = mergePrefixIntoBody({ body, title, prefix }));
 
   if (handleIfActive) {
     const texts = { title, body };
     const isActive = handleIfActive(threadID, texts);
     if (isActive) {
       return;
     }
   }
 }
+
 function getCommAndroidNotificationsEventEmitter(): NativeEventEmitter<{
   commAndroidNotificationsToken: [string],
+  commAndroidNotificationsForegroundMessage: [AndroidForegroundMessage],
 }> {
   return new NativeEventEmitter(CommAndroidNotificationsEventEmitter);
 }
 
 export {
   androidNotificationChannelID,
   handleAndroidMessage,
   getCommAndroidNotificationsEventEmitter,
   CommAndroidNotifications,
 };
diff --git a/native/push/push-handler.react.js b/native/push/push-handler.react.js
index fefe91216..8e100f910 100644
--- a/native/push/push-handler.react.js
+++ b/native/push/push-handler.react.js
@@ -1,627 +1,624 @@
 // @flow
 
 import * as Haptics from 'expo-haptics';
 import * as React from 'react';
 import { Platform, Alert, LogBox } from 'react-native';
-import type { RemoteMessage, NotificationOpen } from 'react-native-firebase';
+import type { NotificationOpen } from 'react-native-firebase';
 import { Notification as InAppNotification } from 'react-native-in-app-message';
 import { useDispatch } from 'react-redux';
 
 import {
   setDeviceTokenActionTypes,
   setDeviceToken,
 } from 'lib/actions/device-actions';
 import { saveMessagesActionType } from 'lib/actions/message-actions';
 import {
   unreadCount,
   threadInfoSelector,
 } from 'lib/selectors/thread-selectors';
 import { isLoggedIn } from 'lib/selectors/user-selectors';
 import { mergePrefixIntoBody } from 'lib/shared/notif-utils';
 import type { RawMessageInfo } from 'lib/types/message-types';
 import type { Dispatch } from 'lib/types/redux-types';
 import { type ConnectionInfo } from 'lib/types/socket-types';
 import { type ThreadInfo } from 'lib/types/thread-types';
 import {
   useServerCall,
   useDispatchActionPromise,
   type DispatchActionPromise,
 } from 'lib/utils/action-utils';
 
 import {
   type MessageListParams,
   useNavigateToThread,
 } from '../chat/message-list-types';
 import {
   addLifecycleListener,
   getCurrentLifecycleState,
 } from '../lifecycle/lifecycle';
 import { replaceWithThreadActionType } from '../navigation/action-types';
 import { activeMessageListSelector } from '../navigation/nav-selectors';
 import { NavContext } from '../navigation/navigation-context';
 import type { RootNavigationProp } from '../navigation/root-navigator.react';
 import { recordNotifPermissionAlertActionType } from '../redux/action-types';
 import { useSelector } from '../redux/redux-utils';
 import { RootContext, type RootContextType } from '../root-context';
 import type { EventSubscription } from '../types/react-native';
 import { type GlobalTheme } from '../types/themes';
 import { type NotifPermissionAlertInfo } from './alerts';
 import {
   androidNotificationChannelID,
   handleAndroidMessage,
   getCommAndroidNotificationsEventEmitter,
+  type AndroidForegroundMessage,
   CommAndroidNotifications,
 } from './android';
 import {
   CommIOSNotification,
   type CoreIOSNotificationData,
   type CoreIOSNotificationDataWithRequestIdentifier,
 } from './comm-ios-notification';
 import { getFirebase } from './firebase';
 import InAppNotif from './in-app-notif.react';
 import {
   requestIOSPushPermissions,
   iosPushPermissionResponseReceived,
   CommIOSNotifications,
   getCommIOSNotificationsEventEmitter,
 } from './ios';
 
 LogBox.ignoreLogs([
   // react-native-firebase
   'Require cycle: ../node_modules/react-native-firebase',
   // react-native-in-app-message
   'ForceTouchGestureHandler is not available',
 ]);
 
 const msInDay = 24 * 60 * 60 * 1000;
 
 type BaseProps = {
   +navigation: RootNavigationProp<'App'>,
 };
 type Props = {
   ...BaseProps,
   // Navigation state
   +activeThread: ?string,
   // Redux state
   +unreadCount: number,
   +deviceToken: ?string,
   +threadInfos: { +[id: string]: ThreadInfo },
   +notifPermissionAlertInfo: NotifPermissionAlertInfo,
   +connection: ConnectionInfo,
   +updatesCurrentAsOf: number,
   +activeTheme: ?GlobalTheme,
   +loggedIn: boolean,
   +navigateToThread: (params: MessageListParams) => void,
   // Redux dispatch functions
   +dispatch: Dispatch,
   +dispatchActionPromise: DispatchActionPromise,
   // async functions that hit server APIs
   +setDeviceToken: (deviceToken: ?string) => Promise<?string>,
   // withRootContext
   +rootContext: ?RootContextType,
 };
 type State = {
   +inAppNotifProps: ?{
     +customComponent: React.Node,
     +blurType: ?('xlight' | 'dark'),
     +onPress: () => void,
   },
 };
 
 class PushHandler extends React.PureComponent<Props, State> {
   state: State = {
     inAppNotifProps: null,
   };
   currentState: ?string = getCurrentLifecycleState();
   appStarted = 0;
   androidNotificationsEventSubscriptions: Array<EventSubscription> = [];
-  androidMessageListener: ?() => void = null;
   androidNotifOpenListener: ?() => void = null;
   initialAndroidNotifHandled = false;
   openThreadOnceReceived: Set<string> = new Set();
   lifecycleSubscription: ?EventSubscription;
   iosNotificationEventSubscriptions: Array<EventSubscription> = [];
 
   componentDidMount() {
     this.appStarted = Date.now();
     this.lifecycleSubscription = addLifecycleListener(
       this.handleAppStateChange,
     );
     this.onForeground();
     if (Platform.OS === 'ios') {
       const commIOSNotificationsEventEmitter = getCommIOSNotificationsEventEmitter();
       this.iosNotificationEventSubscriptions.push(
         commIOSNotificationsEventEmitter.addListener(
           'remoteNotificationsRegistered',
           registration =>
             this.registerPushPermissions(registration?.deviceToken),
         ),
         commIOSNotificationsEventEmitter.addListener(
           'remoteNotificationsRegistrationFailed',
           this.failedToRegisterPushPermissions,
         ),
         commIOSNotificationsEventEmitter.addListener(
           'notificationReceivedForeground',
           this.iosForegroundNotificationReceived,
         ),
         commIOSNotificationsEventEmitter.addListener(
           'notificationOpened',
           this.iosNotificationOpened,
         ),
       );
     } else if (Platform.OS === 'android') {
       const firebase = getFirebase();
       const channel = new firebase.notifications.Android.Channel(
         androidNotificationChannelID,
         'Default',
         firebase.notifications.Android.Importance.Max,
       ).setDescription('Comm notifications channel');
       firebase.notifications().android.createChannel(channel);
       const commAndroidNotificationsEventEmitter = getCommAndroidNotificationsEventEmitter();
       this.androidNotificationsEventSubscriptions.push(
         commAndroidNotificationsEventEmitter.addListener(
           'commAndroidNotificationsToken',
           this.handleAndroidDeviceToken,
         ),
+        commAndroidNotificationsEventEmitter.addListener(
+          'commAndroidNotificationsForegroundMessage',
+          this.androidMessageReceived,
+        ),
       );
-      this.androidMessageListener = firebase
-        .messaging()
-        .onMessage(this.androidMessageReceived);
+
       this.androidNotifOpenListener = firebase
         .notifications()
         .onNotificationOpened(this.androidNotificationOpened);
     }
 
     if (this.props.connection.status === 'connected') {
       this.updateBadgeCount();
     }
   }
 
   componentWillUnmount() {
     if (this.lifecycleSubscription) {
       this.lifecycleSubscription.remove();
     }
     if (Platform.OS === 'ios') {
       for (const iosNotificationEventSubscription of this
         .iosNotificationEventSubscriptions) {
         iosNotificationEventSubscription.remove();
       }
     } else if (Platform.OS === 'android') {
       for (const androidNotificationsEventSubscription of this
         .androidNotificationsEventSubscriptions) {
         androidNotificationsEventSubscription.remove();
       }
       this.androidNotificationsEventSubscriptions = [];
-      if (this.androidMessageListener) {
-        this.androidMessageListener();
-        this.androidMessageListener = null;
-      }
       if (this.androidNotifOpenListener) {
         this.androidNotifOpenListener();
         this.androidNotifOpenListener = null;
       }
     }
   }
 
   handleAppStateChange = (nextState: ?string) => {
     if (!nextState || nextState === 'unknown') {
       return;
     }
     const lastState = this.currentState;
     this.currentState = nextState;
     if (lastState === 'background' && nextState === 'active') {
       this.onForeground();
       this.clearNotifsOfThread();
     }
   };
 
   onForeground() {
     if (this.props.loggedIn) {
       this.ensurePushNotifsEnabled();
     } else if (this.props.deviceToken) {
       // We do this in case there was a crash, so we can clear deviceToken from
       // any other cookies it might be set for
       this.setDeviceToken(this.props.deviceToken);
     }
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {
     if (this.props.activeThread !== prevProps.activeThread) {
       this.clearNotifsOfThread();
     }
 
     if (
       this.props.connection.status === 'connected' &&
       (prevProps.connection.status !== 'connected' ||
         this.props.unreadCount !== prevProps.unreadCount)
     ) {
       this.updateBadgeCount();
     }
 
     for (const threadID of this.openThreadOnceReceived) {
       const threadInfo = this.props.threadInfos[threadID];
       if (threadInfo) {
         this.navigateToThread(threadInfo, false);
         this.openThreadOnceReceived.clear();
         break;
       }
     }
 
     if (
       (this.props.loggedIn && !prevProps.loggedIn) ||
       (!this.props.deviceToken && prevProps.deviceToken)
     ) {
       this.ensurePushNotifsEnabled();
     }
 
     if (!this.props.loggedIn && prevProps.loggedIn) {
       this.clearAllNotifs();
     }
 
     if (
       this.state.inAppNotifProps &&
       this.state.inAppNotifProps !== prevState.inAppNotifProps
     ) {
       Haptics.notificationAsync();
       InAppNotification.show();
     }
   }
 
   updateBadgeCount() {
     const curUnreadCount = this.props.unreadCount;
     if (Platform.OS === 'ios') {
       CommIOSNotifications.setBadgesCount(curUnreadCount);
     } else if (Platform.OS === 'android') {
       getFirebase().notifications().setBadge(curUnreadCount);
     }
   }
 
   clearAllNotifs() {
     if (Platform.OS === 'ios') {
       CommIOSNotifications.removeAllDeliveredNotifications();
     } else if (Platform.OS === 'android') {
       getFirebase().notifications().removeAllDeliveredNotifications();
     }
   }
 
   clearNotifsOfThread() {
     const { activeThread } = this.props;
     if (!activeThread) {
       return;
     }
     if (Platform.OS === 'ios') {
       CommIOSNotifications.getDeliveredNotifications(notifications =>
         PushHandler.clearDeliveredIOSNotificationsForThread(
           activeThread,
           notifications,
         ),
       );
     } else if (Platform.OS === 'android') {
       CommAndroidNotifications.removeAllActiveNotificationsForThread(
         activeThread,
       );
     }
   }
 
   static clearDeliveredIOSNotificationsForThread(
     threadID: string,
     notifications: $ReadOnlyArray<CoreIOSNotificationDataWithRequestIdentifier>,
   ) {
     const identifiersToClear = [];
     for (const notification of notifications) {
       if (notification.threadID === threadID) {
         identifiersToClear.push(notification.identifier);
       }
     }
     if (identifiersToClear) {
       CommIOSNotifications.removeDeliveredNotifications(identifiersToClear);
     }
   }
 
   async ensurePushNotifsEnabled() {
     if (!this.props.loggedIn) {
       return;
     }
     if (Platform.OS === 'ios') {
       const missingDeviceToken =
         this.props.deviceToken === null || this.props.deviceToken === undefined;
       await requestIOSPushPermissions(missingDeviceToken);
     } else if (Platform.OS === 'android') {
       await this.ensureAndroidPushNotifsEnabled();
     }
   }
 
   async ensureAndroidPushNotifsEnabled() {
     const firebase = getFirebase();
     const hasPermission = await firebase.messaging().hasPermission();
     if (!hasPermission) {
       this.failedToRegisterPushPermissions();
       return;
     }
 
     const fcmToken = await firebase.messaging().getToken();
     if (fcmToken) {
       await this.handleAndroidDeviceToken(fcmToken);
     } else {
       this.failedToRegisterPushPermissions();
     }
   }
 
   handleAndroidDeviceToken = async (deviceToken: ?string) => {
     this.registerPushPermissions(deviceToken);
     await this.handleInitialAndroidNotification();
   };
 
   async handleInitialAndroidNotification() {
     if (this.initialAndroidNotifHandled) {
       return;
     }
     this.initialAndroidNotifHandled = true;
     const initialNotif = await getFirebase()
       .notifications()
       .getInitialNotification();
     if (initialNotif) {
       await this.androidNotificationOpened(initialNotif);
     }
   }
 
   registerPushPermissions = (deviceToken: ?string) => {
     const deviceType = Platform.OS;
     if (deviceType !== 'android' && deviceType !== 'ios') {
       return;
     }
     if (deviceType === 'ios') {
       iosPushPermissionResponseReceived();
     }
     if (deviceToken !== this.props.deviceToken) {
       this.setDeviceToken(deviceToken);
     }
   };
 
   setDeviceToken(deviceToken: ?string) {
     this.props.dispatchActionPromise(
       setDeviceTokenActionTypes,
       this.props.setDeviceToken(deviceToken),
     );
   }
 
   failedToRegisterPushPermissions = () => {
     this.setDeviceToken(null);
     if (!this.props.loggedIn) {
       return;
     }
     const deviceType = Platform.OS;
     if (deviceType === 'ios') {
       iosPushPermissionResponseReceived();
     } else {
       this.showNotifAlertOnAndroid();
     }
   };
 
   showNotifAlertOnAndroid() {
     const alertInfo = this.props.notifPermissionAlertInfo;
     if (
       (alertInfo.totalAlerts > 3 &&
         alertInfo.lastAlertTime > Date.now() - msInDay) ||
       (alertInfo.totalAlerts > 6 &&
         alertInfo.lastAlertTime > Date.now() - msInDay * 3) ||
       (alertInfo.totalAlerts > 9 &&
         alertInfo.lastAlertTime > Date.now() - msInDay * 7)
     ) {
       return;
     }
     this.props.dispatch({
       type: recordNotifPermissionAlertActionType,
       payload: { time: Date.now() },
     });
 
     Alert.alert(
       'Unable to initialize notifs!',
       'Please check your network connection, make sure Google Play ' +
         'services are installed and enabled, and confirm that your Google ' +
         'Play credentials are valid in the Google Play Store.',
       undefined,
       { cancelable: true },
     );
   }
 
   navigateToThread(threadInfo: ThreadInfo, clearChatRoutes: boolean) {
     if (clearChatRoutes) {
       this.props.navigation.dispatch({
         type: replaceWithThreadActionType,
         payload: { threadInfo },
       });
     } else {
       this.props.navigateToThread({ threadInfo });
     }
   }
 
   onPressNotificationForThread(threadID: string, clearChatRoutes: boolean) {
     const threadInfo = this.props.threadInfos[threadID];
     if (threadInfo) {
       this.navigateToThread(threadInfo, clearChatRoutes);
     } else {
       this.openThreadOnceReceived.add(threadID);
     }
   }
 
   saveMessageInfos(messageInfosString: ?string) {
     if (!messageInfosString) {
       return;
     }
     const rawMessageInfos: $ReadOnlyArray<RawMessageInfo> = JSON.parse(
       messageInfosString,
     );
     const { updatesCurrentAsOf } = this.props;
     this.props.dispatch({
       type: saveMessagesActionType,
       payload: { rawMessageInfos, updatesCurrentAsOf },
     });
   }
 
   iosForegroundNotificationReceived = (
     rawNotification: CoreIOSNotificationData,
   ) => {
     const notification = new CommIOSNotification(rawNotification);
     if (Date.now() < this.appStarted + 1500) {
       // On iOS, when the app is opened from a notif press, for some reason this
       // callback gets triggered before iosNotificationOpened. In fact this
       // callback shouldn't be triggered at all. To avoid weirdness we are
       // ignoring any foreground notification received within the first second
       // of the app being started, since they are most likely to be erroneous.
       notification.finish(
         CommIOSNotifications.getConstants().FETCH_RESULT_NO_DATA,
       );
       return;
     }
     const threadID = notification.getData().threadID;
     const messageInfos = notification.getData().messageInfos;
     this.saveMessageInfos(messageInfos);
 
     let title = notification.getData().title;
     let body = notification.getData().body;
 
     if (title && body) {
       ({ title, body } = mergePrefixIntoBody({ title, body }));
     } else {
       body = notification.getMessage();
     }
 
     if (body) {
       this.showInAppNotification(threadID, body, title);
     } else {
       console.log(
         'Non-rescind foreground notification without alert received!',
       );
     }
     notification.finish(
       CommIOSNotifications.getConstants().FETCH_RESULT_NEW_DATA,
     );
   };
 
   onPushNotifBootsApp() {
     if (
       this.props.rootContext &&
       this.props.rootContext.detectUnsupervisedBackground
     ) {
       this.props.rootContext.detectUnsupervisedBackground(false);
     }
   }
 
   iosNotificationOpened = (rawNotification: CoreIOSNotificationData) => {
     const notification = new CommIOSNotification(rawNotification);
     this.onPushNotifBootsApp();
     const threadID = notification.getData().threadID;
     const messageInfos = notification.getData().messageInfos;
     this.saveMessageInfos(messageInfos);
     this.onPressNotificationForThread(threadID, true);
     notification.finish(
       CommIOSNotifications.getConstants().FETCH_RESULT_NEW_DATA,
     );
   };
 
   showInAppNotification(threadID: string, message: string, title?: ?string) {
     if (threadID === this.props.activeThread) {
       return;
     }
     this.setState({
       inAppNotifProps: {
         customComponent: (
           <InAppNotif
             title={title}
             message={message}
             activeTheme={this.props.activeTheme}
           />
         ),
         blurType: this.props.activeTheme === 'dark' ? 'xlight' : 'dark',
         onPress: () => {
           InAppNotification.hide();
           this.onPressNotificationForThread(threadID, false);
         },
       },
     });
   }
 
   androidNotificationOpened = async (notificationOpen: NotificationOpen) => {
     this.onPushNotifBootsApp();
     const { threadID } = notificationOpen.notification.data;
     this.onPressNotificationForThread(threadID, true);
   };
 
-  androidMessageReceived = async (message: RemoteMessage) => {
+  androidMessageReceived = async (message: AndroidForegroundMessage) => {
     this.onPushNotifBootsApp();
 
-    const { data } = message;
-    const { messageInfos } = data;
+    const { messageInfos } = message;
     this.saveMessageInfos(messageInfos);
 
     handleAndroidMessage(
       message,
       this.props.updatesCurrentAsOf,
       this.handleAndroidNotificationIfActive,
     );
   };
 
   handleAndroidNotificationIfActive = (
     threadID: string,
     texts: { body: string, title: ?string },
   ) => {
     if (this.currentState !== 'active') {
       return false;
     }
     this.showInAppNotification(threadID, texts.body, texts.title);
     return true;
   };
 
   render() {
     return (
       <InAppNotification
         {...this.state.inAppNotifProps}
         hideStatusBar={false}
       />
     );
   }
 }
 
 const ConnectedPushHandler: React.ComponentType<BaseProps> = React.memo<BaseProps>(
   function ConnectedPushHandler(props: BaseProps) {
     const navContext = React.useContext(NavContext);
     const activeThread = activeMessageListSelector(navContext);
     const boundUnreadCount = useSelector(unreadCount);
     const deviceToken = useSelector(state => state.deviceToken);
     const threadInfos = useSelector(threadInfoSelector);
     const notifPermissionAlertInfo = useSelector(
       state => state.notifPermissionAlertInfo,
     );
     const connection = useSelector(state => state.connection);
     const updatesCurrentAsOf = useSelector(state => state.updatesCurrentAsOf);
     const activeTheme = useSelector(state => state.globalThemeInfo.activeTheme);
     const loggedIn = useSelector(isLoggedIn);
     const navigateToThread = useNavigateToThread();
     const dispatch = useDispatch();
     const dispatchActionPromise = useDispatchActionPromise();
     const boundSetDeviceToken = useServerCall(setDeviceToken);
     const rootContext = React.useContext(RootContext);
     return (
       <PushHandler
         {...props}
         activeThread={activeThread}
         unreadCount={boundUnreadCount}
         deviceToken={deviceToken}
         threadInfos={threadInfos}
         notifPermissionAlertInfo={notifPermissionAlertInfo}
         connection={connection}
         updatesCurrentAsOf={updatesCurrentAsOf}
         activeTheme={activeTheme}
         loggedIn={loggedIn}
         navigateToThread={navigateToThread}
         dispatch={dispatch}
         dispatchActionPromise={dispatchActionPromise}
         setDeviceToken={boundSetDeviceToken}
         rootContext={rootContext}
       />
     );
   },
 );
 
 export default ConnectedPushHandler;