diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt
index d2e3dcf4e..c2ce4615f 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt
@@ -208,9 +208,12 @@ class IncomingLocationMessageViewHolder(incomingView: View) : MessageHolders
         }
 
         val urlStringBuffer = StringBuffer("file:///android_asset/leafletMapMessagePreview.html")
-        urlStringBuffer.append("?mapProviderUrl=" + URLEncoder.encode(context!!.getString(R.string.osm_tile_server_url)))
-        urlStringBuffer.append("&mapProviderAttribution=" + URLEncoder.encode(context!!.getString(R.string
-            .osm_tile_server_attributation)))
+        urlStringBuffer.append(
+            "?mapProviderUrl=" + URLEncoder.encode(context!!.getString(R.string.osm_tile_server_url))
+        )
+        urlStringBuffer.append(
+            "&mapProviderAttribution=" + URLEncoder.encode(context!!.getString(R.string.osm_tile_server_attributation))
+        )
         urlStringBuffer.append("&locationLat=" + URLEncoder.encode(locationLat))
         urlStringBuffer.append("&locationLon=" + URLEncoder.encode(locationLon))
         urlStringBuffer.append("&locationName=" + URLEncoder.encode(locationName))
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 8a5642da4..30cc85965 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -813,7 +813,7 @@ class ChatController(args: Bundle) :
         Log.d(TAG, "showShareLocationScreen")
 
         val bundle = Bundle()
-        bundle.putString(BundleKeys.KEY_ROOM_TOKEN,roomToken)
+        bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken)
         router.pushController(
             RouterTransaction.with(LocationPickerController(bundle))
                 .pushChangeHandler(HorizontalChangeHandler())
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
index 766ff9a83..b076c0345 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
@@ -24,7 +24,6 @@ import android.Manifest
 import android.app.SearchManager
 import android.content.Context
 import android.content.pm.PackageManager
-import android.graphics.drawable.ColorDrawable
 import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
@@ -64,7 +63,6 @@ import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.controller_location.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -163,7 +161,6 @@ class LocationPickerController(args: Bundle) :
         get() =
             resources!!.getString(R.string.nc_share_location)
 
-
     override fun onViewBound(view: View) {
         setLocationDescription(false, receivedChosenGeocodingResult)
         binding.shareLocation.isClickable = false
@@ -240,9 +237,12 @@ class LocationPickerController(args: Bundle) :
 
         locationOverlay = MyLocationNewOverlay(GpsMyLocationProvider(context), binding.map)
         locationOverlay.enableMyLocation()
-        locationOverlay.setPersonHotspot(20.0F,20.0F)
+        locationOverlay.setPersonHotspot(20.0F, 20.0F)
         locationOverlay.setPersonIcon(
-             DisplayUtils.getBitmap(ResourcesCompat.getDrawable(resources!!, R.drawable.current_location_circle, null)))
+            DisplayUtils.getBitmap(
+                ResourcesCompat.getDrawable(resources!!, R.drawable.current_location_circle, null)
+            )
+        )
         binding.map.overlays?.add(locationOverlay)
 
         val mapController = binding.map.controller
diff --git a/app/src/main/java/com/nextcloud/talk/interfaces/ExtendedIMessage.kt b/app/src/main/java/com/nextcloud/talk/interfaces/ExtendedIMessage.kt
index 8175abc90..a494eeded 100644
--- a/app/src/main/java/com/nextcloud/talk/interfaces/ExtendedIMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/interfaces/ExtendedIMessage.kt
@@ -24,6 +24,5 @@ import com.stfalcon.chatkit.commons.models.IMessage
 
 interface ExtendedIMessage : IMessage {
 
-    fun isLocationMessage() : Boolean
-
-}
\ No newline at end of file
+    fun isLocationMessage(): Boolean
+}
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
index 0117b2842..984a858ef 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
@@ -33,7 +33,7 @@ class ChatUtils {
                     val type = individualHashMap?.get("type")
                     if (type == "user" || type == "guest" || type == "call") {
                         resultMessage = resultMessage?.replace("{$key}", "@" + individualHashMap["name"])
-                    } else if(type == "geo-location"){
+                    } else if (type == "geo-location") {
                         resultMessage = individualHashMap.get("name")
                     } else if (individualHashMap?.containsKey("link") == true) {
                         resultMessage = if (type == "file") {
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt
index a1dc8481d..89b4b88a7 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt
@@ -72,7 +72,9 @@ class AttachmentDialog(val activity: Activity, var chatController: ChatControlle
 
         if (!CapabilitiesUtil.hasSpreedFeatureCapability(
                 chatController.conversationUser,
-                "geo-location-sharing")){
+                "geo-location-sharing"
+            )
+        ) {
             shareLocationItem?.visibility = View.GONE
         }