diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
index e1b95d4a3..1c1636f4f 100644
--- a/jni/dc_wrapper.c
+++ b/jni/dc_wrapper.c
@@ -1117,6 +1117,12 @@ JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_hasDeviatingTimestamp(JNIEnv *e
}
+JNIEXPORT jboolean Java_com_b44t_messenger_DcMsg_hasLocation(JNIEnv *env, jobject obj)
+{
+ return dc_msg_has_location(get_dc_msg(env, obj))!=0;
+}
+
+
JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getType(JNIEnv *env, jobject obj)
{
return dc_msg_get_viewtype(get_dc_msg(env, obj));
diff --git a/res/drawable-xhdpi/ic_location_msg.png b/res/drawable-xhdpi/ic_location_msg.png
new file mode 100644
index 000000000..3fa06346e
Binary files /dev/null and b/res/drawable-xhdpi/ic_location_msg.png differ
diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml
index 18950a0a7..7fb0e7bdc 100644
--- a/res/layout/conversation_item_footer.xml
+++ b/res/layout/conversation_item_footer.xml
@@ -28,6 +28,16 @@
android:textColor="?conversation_item_outgoing_text_secondary_color"
tools:text="30 mins"/>
+
+