diff --git a/res/layout/add_poi_view.xml b/res/layout/add_poi_view.xml
index b5ff92099..6f6e59398 100644
--- a/res/layout/add_poi_view.xml
+++ b/res/layout/add_poi_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="250dp"
-    android:layout_height="70dp"
+    android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:background="@drawable/map_bubble_add_poi"
@@ -30,14 +30,14 @@
             android:layout_marginRight="4dp"
             android:layout_marginStart="4dp"
             android:layout_marginEnd="4dp"
-            android:maxLines="1"
-            android:maxLength="16"
+            android:maxLines="5"
             android:layout_gravity="center"
             />
 
         <RelativeLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
             <ImageButton
                 android:id="@+id/sendView"
                 android:layout_gravity="center_vertical"
@@ -63,4 +63,4 @@
 
     </LinearLayout>
 
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/src/org/thoughtcrime/securesms/map/DataCollector.java b/src/org/thoughtcrime/securesms/map/DataCollector.java
index a43ba57b2..01a8b49da 100644
--- a/src/org/thoughtcrime/securesms/map/DataCollector.java
+++ b/src/org/thoughtcrime/securesms/map/DataCollector.java
@@ -119,7 +119,7 @@ public class DataCollector {
             if (isPoi && codepointChar.length() == 0 && messageId != 0) {
                 //has a long poi label
                 DcMsg poiMsg = dcContext.getMsg(messageId);
-                String poiLongDescription = poiMsg.getText();
+                String poiLongDescription = poiMsg.getSummarytext(16);
                 pointFeature.addStringProperty(POI_LONG_DESCRIPTION, poiLongDescription);
             }