diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index 55f4567956..f13ccd95c3 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -8,3 +8,4 @@
 0.07: Include charging state in battery updates to phone
 0.08: Handling of alarms
 0.09: Alarm vibration, repeat, and auto-snooze now handled by sched
+0.10: Fix SMS bug
diff --git a/apps/android/boot.js b/apps/android/boot.js
index fb2101aa4a..efd7e7e46b 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -3,6 +3,7 @@
     Bluetooth.println("");
     Bluetooth.println(JSON.stringify(message));
   }
+  var lastMsg;
 
   var settings = require("Storage").readJSON("android.settings.json",1)||{};
   //default alarm settings
@@ -18,7 +19,17 @@
     /* TODO: Call handling, fitness */
     var HANDLERS = {
       // {t:"notify",id:int, src,title,subject,body,sender,tel:string} add
-      "notify" : function() { Object.assign(event,{t:"add",positive:true, negative:true});require("messages").pushMessage(event); },
+      "notify" : function() {
+        Object.assign(event,{t:"add",positive:true, negative:true});
+        // Detect a weird GadgetBridge bug and fix it
+        // For some reason SMS messages send two GB notifications, with different sets of info
+        if (lastMsg && event.body == lastMsg.body && lastMsg.src == undefined && event.src == "Messages") {
+          // Mutate the other message
+          event.id = lastMsg.id;
+        }
+        lastMsg = event;
+        require("messages").pushMessage(event);
+      },
       // {t:"notify~",id:int, title:string} // modified
       "notify~" : function() { event.t="modify";require("messages").pushMessage(event); },
       // {t:"notify-",id:int} // remove
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index 4051a344be..bf37b84073 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",