diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 98f3cf5c1..6011a22b7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -71,6 +71,11 @@ public class XWPrefs {
         return getPrefsBoolean( context, R.string.key_ignore_fcm, false );
     }
 
+    public static boolean getToastFCM( Context context )
+    {
+        return getPrefsBoolean( context, R.string.key_show_fcm, false );
+    }
+
     public static boolean getSMSToSelfEnabled( Context context )
     {
         return getPrefsBoolean( context, R.string.key_enable_sms_toself, false );
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 0f609e3d2..4041cee78 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -127,6 +127,7 @@
   <string name="key_enable_sms_toself">key_enable_sms_toself</string>
   <string name="key_enable_smsproto">key_enable_smsproto</string>
   <string name="key_ignore_fcm">key_ignore_fcm</string>
+  <string name="key_show_fcm">key_show_fcm</string>
   <string name="key_nag_intervals">key_nag_intervals</string>
   <string name="key_download_path">key_download_path</string>
   <string name="key_got_langdict">key_got_langdict</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 9a7041adc..d41c5a24b 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2643,6 +2643,7 @@
   <string name="ignore_fcm_summary">Mimic life without a google account</string>
 
   <string name="show_sms_title">Show SMS sends, receives</string>
+  <string name="show_fcm_title">Show FCM receives</string>
 
   <!-- Shown after "resend messages" menuitem chosen -->
   <plurals name="resent_msgs_fmt">
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index 61b110a6d..9045fe6b5 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -398,6 +398,10 @@
                           android:summary="@string/ignore_fcm_summary"
                           android:defaultValue="false"
                           />
+      <CheckBoxPreference android:key="@string/key_show_fcm"
+                          android:title="@string/show_fcm_title"
+                          android:defaultValue="false"
+                          />
       <org.eehouse.android.xw4.XWEditTextPreference 
           android:key="@string/key_relay_host"
           android:title="@string/relay_host"
diff --git a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java
index f9fe8f2e8..5c5ec233e 100644
--- a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java
+++ b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/FBMService.java
@@ -58,12 +58,9 @@ public class FBMService extends FirebaseMessagingService {
         } else {
             RelayService.fcmConfirmed( this, true );
 
-            if ( BuildConfig.DEBUG ) {
-                Utils.showToast( this, TAG + ".onMessageReceived()" );
-            }
-
             Map<String, String>	data = message.getData();
             Log.d( TAG, "onMessageReceived(data=%s)", data );
+            boolean toastFCM = XWPrefs.getToastFCM( this );
 
             String value = data.get( "msgs64" );
             if ( null != value ) {
@@ -71,6 +68,10 @@ public class FBMService extends FirebaseMessagingService {
                 try {
                     JSONArray msgs64 = new JSONArray( value );
                     String[] strs64 = new String[msgs64.length()];
+                    if ( toastFCM ) {
+                        DbgUtils.showf( this, "%s.onMessageReceived(): got %d msgs",
+                                        TAG, strs64.length );
+                    }
 
                     for ( int ii = 0; ii < strs64.length; ++ii ) {
                         strs64[ii] = msgs64.optString(ii);
@@ -94,6 +95,10 @@ public class FBMService extends FirebaseMessagingService {
             value = data.get( "getMoves" );
             if ( null != value && Boolean.parseBoolean( value ) ) {
                 RelayService.timerFired( this );
+                if ( toastFCM ) {
+                    DbgUtils.showf( this, "%s.onMessageReceived(): got 'getMoves'",
+                                    TAG );
+                }
             }
 
             value = data.get( "msg" );
@@ -121,7 +126,6 @@ public class FBMService extends FirebaseMessagingService {
         if ( null == result ) {
             getTokenAsync( context );
         }
-
         return result;
     }