diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
index e339c2448..dbaf47ba7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
@@ -324,8 +324,13 @@ fun MapView(
                 label = "${u.shortName} ${formatAgo(p.time)}"
             ).apply {
                 id = u.id
-                title = "${u.longName} ${node.batteryStr}"
-                snippet = node.gpsString(gpsFormat)
+                title = u.longName
+                snippet = context.getString(R.string.map_node_popup_details,
+                    node.gpsString(gpsFormat),
+                    formatAgo(node.lastHeard),
+                    formatAgo(p.time),
+                    if (node.batteryStr != "") node.batteryStr else "?"
+                )
                 ourNode?.distanceStr(node, displayUnits)?.let { dist ->
                     subDescription =
                         context.getString(R.string.map_subDescription, ourNode.bearing(node), dist)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3b128c096..c6868a03f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -344,4 +344,5 @@
     <string name="baro_pressure">Barometric Pressure</string>
     <string name="mesh_via_udp_enabled">Mesh via UDP enabled</string>
     <string name="udp_config">UDP Config</string>
+    <string name="map_node_popup_details"><![CDATA[%s<br>Last heard: %s<br>Last position: %s<br>Battery: %s]]></string>
 </resources>