diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4001a9a0e..c5b1af412 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,10 +141,6 @@
             android:configChanges="orientation|keyboardHidden|screenSize">
         </activity>
 
-        <activity
-            android:name=".activities.LeafletWebView">
-        </activity>
-
         <receiver android:name=".receivers.PackageReplacedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
diff --git a/app/src/main/java/com/nextcloud/talk/activities/LeafletWebView.kt b/app/src/main/java/com/nextcloud/talk/activities/LeafletWebView.kt
deleted file mode 100644
index fc1b44330..000000000
--- a/app/src/main/java/com/nextcloud/talk/activities/LeafletWebView.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.nextcloud.talk.activities
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.appcompat.app.AppCompatActivity
-import com.nextcloud.talk.databinding.LeafletWebviewBinding
-
-class LeafletWebView : AppCompatActivity() {
-    lateinit var binding: LeafletWebviewBinding
-
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = LeafletWebviewBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        binding.webview.settings.javaScriptEnabled = true
-
-        binding.webview.webViewClient = object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
-                view?.loadUrl(url)
-                return true
-            }
-        }
-        binding.webview.loadUrl("file:///android_asset/leafletMapMessagePreview.html?51.5263,13.0384");
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index ff15e4eae..bb16795d4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -828,12 +828,6 @@ class ChatController(args: Bundle) :
                 .pushChangeHandler(HorizontalChangeHandler())
                 .popChangeHandler(HorizontalChangeHandler())
         )
-
-        // val leafletIntent = Intent(context, LeafletWebView::class.java)
-        // leafletIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        // // fullScreenImageIntent.putExtra("FILE_NAME", filename)
-        // // fullScreenImageIntent.putExtra("IS_GIF", isGif(mimetype))
-        // context!!.startActivity(leafletIntent)
     }
 
     private fun showConversationInfoScreen() {
diff --git a/app/src/main/res/layout/leaflet_webview.xml b/app/src/main/res/layout/leaflet_webview.xml
deleted file mode 100644
index 67f0dbf55..000000000
--- a/app/src/main/res/layout/leaflet_webview.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <WebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file