diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0077684a5..771c99e9c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -856,9 +856,15 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 toggleInputMethod();
                 break;
             case ATTACHMENT_CHOICE_LOCATION:
-                double latitude = data.getDoubleExtra("latitude", 0);
-                double longitude = data.getDoubleExtra("longitude", 0);
-                Uri geo = Uri.parse("geo:" + latitude + "," + longitude);
+                final double latitude = data.getDoubleExtra("latitude", 0);
+                final double longitude = data.getDoubleExtra("longitude", 0);
+                final int accuracy = data.getIntExtra("accuracy", 0);
+                final Uri geo;
+                if (accuracy > 0) {
+                    geo = Uri.parse(String.format("geo:%s,%s;u=%s", latitude, longitude, accuracy));
+                } else {
+                    geo = Uri.parse(String.format("geo:%s,%s", latitude, longitude));
+                }
                 mediaPreviewAdapter.addMediaPreviews(Attachment.of(getActivity(), geo, Attachment.Type.LOCATION));
                 toggleInputMethod();
                 break;
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
index 641a01e5c..7e53fe897 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java
@@ -13,10 +13,13 @@ import androidx.annotation.NonNull;
 import androidx.databinding.DataBindingUtil;
 
 import com.google.android.material.snackbar.Snackbar;
+import com.google.common.math.DoubleMath;
 
 import org.osmdroid.api.IGeoPoint;
 import org.osmdroid.util.GeoPoint;
 
+import java.math.RoundingMode;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityShareLocationBinding;
@@ -28,213 +31,213 @@ import eu.siacs.conversations.utils.ThemeHelper;
 
 public class ShareLocationActivity extends LocationActivity implements LocationListener {
 
-	private Snackbar snackBar;
-	private ActivityShareLocationBinding binding;
-	private boolean marker_fixed_to_loc = false;
-	private static final String KEY_FIXED_TO_LOC = "fixed_to_loc";
-	private Boolean noAskAgain = false;
+    private Snackbar snackBar;
+    private ActivityShareLocationBinding binding;
+    private boolean marker_fixed_to_loc = false;
+    private static final String KEY_FIXED_TO_LOC = "fixed_to_loc";
+    private Boolean noAskAgain = false;
 
-	@Override
-	protected void onSaveInstanceState(@NonNull final Bundle outState) {
-		super.onSaveInstanceState(outState);
+    @Override
+    protected void onSaveInstanceState(@NonNull final Bundle outState) {
+        super.onSaveInstanceState(outState);
 
-		outState.putBoolean(KEY_FIXED_TO_LOC, marker_fixed_to_loc);
-	}
+        outState.putBoolean(KEY_FIXED_TO_LOC, marker_fixed_to_loc);
+    }
 
-	@Override
-	protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
-		super.onRestoreInstanceState(savedInstanceState);
+    @Override
+    protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
 
-		if (savedInstanceState.containsKey(KEY_FIXED_TO_LOC)) {
-			this.marker_fixed_to_loc = savedInstanceState.getBoolean(KEY_FIXED_TO_LOC);
-		}
-	}
+        if (savedInstanceState.containsKey(KEY_FIXED_TO_LOC)) {
+            this.marker_fixed_to_loc = savedInstanceState.getBoolean(KEY_FIXED_TO_LOC);
+        }
+    }
 
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-		this.binding = DataBindingUtil.setContentView(this,R.layout.activity_share_location);
-		setSupportActionBar(binding.toolbar);
-		configureActionBar(getSupportActionBar());
-		setupMapView(binding.map, LocationProvider.getGeoPoint(this));
+        this.binding = DataBindingUtil.setContentView(this, R.layout.activity_share_location);
+        setSupportActionBar(binding.toolbar);
+        configureActionBar(getSupportActionBar());
+        setupMapView(binding.map, LocationProvider.getGeoPoint(this));
 
-		this.binding.cancelButton.setOnClickListener(view -> {
-			setResult(RESULT_CANCELED);
-			finish();
-		});
+        this.binding.cancelButton.setOnClickListener(view -> {
+            setResult(RESULT_CANCELED);
+            finish();
+        });
 
-		this.snackBar = Snackbar.make(this.binding.snackbarCoordinator, R.string.location_disabled, Snackbar.LENGTH_INDEFINITE);
-		this.snackBar.setAction(R.string.enable, view -> {
-			if (isLocationEnabledAndAllowed()) {
-				updateUi();
-			} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !hasLocationPermissions()) {
-				requestPermissions(REQUEST_CODE_SNACKBAR_PRESSED);
-			} else if (!isLocationEnabled()) {
-				startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-			}
-		});
-		ThemeHelper.fix(this.snackBar);
+        this.snackBar = Snackbar.make(this.binding.snackbarCoordinator, R.string.location_disabled, Snackbar.LENGTH_INDEFINITE);
+        this.snackBar.setAction(R.string.enable, view -> {
+            if (isLocationEnabledAndAllowed()) {
+                updateUi();
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !hasLocationPermissions()) {
+                requestPermissions(REQUEST_CODE_SNACKBAR_PRESSED);
+            } else if (!isLocationEnabled()) {
+                startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+            }
+        });
+        ThemeHelper.fix(this.snackBar);
 
-		this.binding.shareButton.setOnClickListener(view -> {
-			final Intent result = new Intent();
+        this.binding.shareButton.setOnClickListener(this::shareLocation);
 
-			if (marker_fixed_to_loc && myLoc != null) {
-				result.putExtra("latitude", myLoc.getLatitude());
-				result.putExtra("longitude", myLoc.getLongitude());
-				result.putExtra("altitude", myLoc.getAltitude());
-				result.putExtra("accuracy", (int) myLoc.getAccuracy());
-			} else {
-				final IGeoPoint markerPoint = this.binding.map.getMapCenter();
-				result.putExtra("latitude", markerPoint.getLatitude());
-				result.putExtra("longitude", markerPoint.getLongitude());
-			}
+        this.marker_fixed_to_loc = isLocationEnabledAndAllowed();
 
-			setResult(RESULT_OK, result);
-			finish();
-		});
+        this.binding.fab.setOnClickListener(view -> {
+            if (!marker_fixed_to_loc) {
+                if (!isLocationEnabled()) {
+                    startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    requestPermissions(REQUEST_CODE_FAB_PRESSED);
+                }
+            }
+            toggleFixedLocation();
+        });
+    }
 
-		this.marker_fixed_to_loc = isLocationEnabledAndAllowed();
+    private void shareLocation(final View view) {
+        final Intent result = new Intent();
+        if (marker_fixed_to_loc && myLoc != null) {
+            result.putExtra("latitude", myLoc.getLatitude());
+            result.putExtra("longitude", myLoc.getLongitude());
+            result.putExtra("altitude", myLoc.getAltitude());
+            result.putExtra("accuracy", DoubleMath.roundToInt(myLoc.getAccuracy(), RoundingMode.HALF_UP));
+        } else {
+            final IGeoPoint markerPoint = this.binding.map.getMapCenter();
+            result.putExtra("latitude", markerPoint.getLatitude());
+            result.putExtra("longitude", markerPoint.getLongitude());
+        }
+        setResult(RESULT_OK, result);
+        finish();
+    }
 
-		this.binding.fab.setOnClickListener(view -> {
-			if (!marker_fixed_to_loc) {
-				if (!isLocationEnabled()) {
-					startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-				} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-					requestPermissions(REQUEST_CODE_FAB_PRESSED);
-				}
-			}
-			toggleFixedLocation();
-		});
-	}
+    @Override
+    public void onRequestPermissionsResult(final int requestCode,
+                                           @NonNull final String[] permissions,
+                                           @NonNull final int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
-	@Override
-	public void onRequestPermissionsResult(final int requestCode,
-										   @NonNull final String[] permissions,
-										   @NonNull final int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (grantResults.length > 0 &&
+                grantResults[0] != PackageManager.PERMISSION_GRANTED &&
+                Build.VERSION.SDK_INT >= 23 &&
+                permissions.length > 0 &&
+                (
+                        Manifest.permission.LOCATION_HARDWARE.equals(permissions[0]) ||
+                                Manifest.permission.ACCESS_FINE_LOCATION.equals(permissions[0]) ||
+                                Manifest.permission.ACCESS_COARSE_LOCATION.equals(permissions[0])
+                ) &&
+                !shouldShowRequestPermissionRationale(permissions[0])) {
+            noAskAgain = true;
+        }
 
-		if (grantResults.length > 0 &&
-				grantResults[0] != PackageManager.PERMISSION_GRANTED &&
-				Build.VERSION.SDK_INT >= 23 &&
-				permissions.length > 0 &&
-				(
-						Manifest.permission.LOCATION_HARDWARE.equals(permissions[0]) ||
-								Manifest.permission.ACCESS_FINE_LOCATION.equals(permissions[0]) ||
-								Manifest.permission.ACCESS_COARSE_LOCATION.equals(permissions[0])
-				) &&
-				!shouldShowRequestPermissionRationale(permissions[0])) {
-			noAskAgain = true;
-		}
+        if (!noAskAgain && requestCode == REQUEST_CODE_SNACKBAR_PRESSED && !isLocationEnabled() && hasLocationPermissions()) {
+            startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+        }
+        updateUi();
+    }
 
-		if (!noAskAgain && requestCode == REQUEST_CODE_SNACKBAR_PRESSED && !isLocationEnabled() && hasLocationPermissions()) {
-			startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-		}
-		updateUi();
-	}
+    @Override
+    protected void gotoLoc(final boolean setZoomLevel) {
+        if (this.myLoc != null && mapController != null) {
+            if (setZoomLevel) {
+                mapController.setZoom(Config.Map.FINAL_ZOOM_LEVEL);
+            }
+            mapController.animateTo(new GeoPoint(this.myLoc));
+        }
+    }
 
-	@Override
-	protected void gotoLoc(final boolean setZoomLevel) {
-		if (this.myLoc != null && mapController != null) {
-			if (setZoomLevel) {
-				mapController.setZoom(Config.Map.FINAL_ZOOM_LEVEL);
-			}
-			mapController.animateTo(new GeoPoint(this.myLoc));
-		}
-	}
+    @Override
+    protected void setMyLoc(final Location location) {
+        this.myLoc = location;
+    }
 
-	@Override
-	protected void setMyLoc(final Location location) {
-		this.myLoc = location;
-	}
+    @Override
+    protected void onPause() {
+        super.onPause();
+    }
 
-	@Override
-	protected void onPause() {
-		super.onPause();
-	}
+    @Override
+    protected void updateLocationMarkers() {
+        super.updateLocationMarkers();
+        if (this.myLoc != null) {
+            this.binding.map.getOverlays().add(new MyLocation(this, null, this.myLoc));
+            if (this.marker_fixed_to_loc) {
+                this.binding.map.getOverlays().add(new Marker(marker_icon, new GeoPoint(this.myLoc)));
+            } else {
+                this.binding.map.getOverlays().add(new Marker(marker_icon));
+            }
+        } else {
+            this.binding.map.getOverlays().add(new Marker(marker_icon));
+        }
+    }
 
-	@Override
-	protected void updateLocationMarkers() {
-		super.updateLocationMarkers();
-		if (this.myLoc != null) {
-			this.binding.map.getOverlays().add(new MyLocation(this, null, this.myLoc));
-			if (this.marker_fixed_to_loc) {
-				this.binding.map.getOverlays().add(new Marker(marker_icon, new GeoPoint(this.myLoc)));
-			} else {
-				this.binding.map.getOverlays().add(new Marker(marker_icon));
-			}
-		} else {
-			this.binding.map.getOverlays().add(new Marker(marker_icon));
-		}
-	}
+    @Override
+    public void onLocationChanged(final Location location) {
+        if (this.myLoc == null) {
+            this.marker_fixed_to_loc = true;
+        }
+        updateUi();
+        if (LocationHelper.isBetterLocation(location, this.myLoc)) {
+            final Location oldLoc = this.myLoc;
+            this.myLoc = location;
 
-	@Override
-	public void onLocationChanged(final Location location) {
-		if (this.myLoc == null) {
-			this.marker_fixed_to_loc = true;
-		}
-		updateUi();
-		if (LocationHelper.isBetterLocation(location, this.myLoc)) {
-			final Location oldLoc = this.myLoc;
-			this.myLoc = location;
+            // Don't jump back to the users location if they're not moving (more or less).
+            if (oldLoc == null || (this.marker_fixed_to_loc && this.myLoc.distanceTo(oldLoc) > 1)) {
+                gotoLoc();
+            }
 
-			// Don't jump back to the users location if they're not moving (more or less).
-			if (oldLoc == null || (this.marker_fixed_to_loc && this.myLoc.distanceTo(oldLoc) > 1)) {
-				gotoLoc();
-			}
+            updateLocationMarkers();
+        }
+    }
 
-			updateLocationMarkers();
-		}
-	}
+    @Override
+    public void onStatusChanged(final String provider, final int status, final Bundle extras) {
 
-	@Override
-	public void onStatusChanged(final String provider, final int status, final Bundle extras) {
+    }
 
-	}
+    @Override
+    public void onProviderEnabled(final String provider) {
 
-	@Override
-	public void onProviderEnabled(final String provider) {
+    }
 
-	}
+    @Override
+    public void onProviderDisabled(final String provider) {
 
-	@Override
-	public void onProviderDisabled(final String provider) {
+    }
 
-	}
+    private boolean isLocationEnabledAndAllowed() {
+        return this.hasLocationFeature && (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || this.hasLocationPermissions()) && this.isLocationEnabled();
+    }
 
-	private boolean isLocationEnabledAndAllowed() {
-		return this.hasLocationFeature && (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || this.hasLocationPermissions()) && this.isLocationEnabled();
-	}
+    private void toggleFixedLocation() {
+        this.marker_fixed_to_loc = isLocationEnabledAndAllowed() && !this.marker_fixed_to_loc;
+        if (this.marker_fixed_to_loc) {
+            gotoLoc(false);
+        }
+        updateLocationMarkers();
+        updateUi();
+    }
 
-	private void toggleFixedLocation() {
-		this.marker_fixed_to_loc = isLocationEnabledAndAllowed() && !this.marker_fixed_to_loc;
-		if (this.marker_fixed_to_loc) {
-			gotoLoc(false);
-		}
-		updateLocationMarkers();
-		updateUi();
-	}
+    @Override
+    protected void updateUi() {
+        if (!hasLocationFeature || noAskAgain || isLocationEnabledAndAllowed()) {
+            this.snackBar.dismiss();
+        } else {
+            this.snackBar.show();
+        }
 
-	@Override
-	protected void updateUi() {
-		if (!hasLocationFeature || noAskAgain || isLocationEnabledAndAllowed()) {
-			this.snackBar.dismiss();
-		} else {
-			this.snackBar.show();
-		}
-
-		if (isLocationEnabledAndAllowed()) {
-			this.binding.fab.setVisibility(View.VISIBLE);
-			runOnUiThread(() -> {
-				this.binding.fab.setImageResource(marker_fixed_to_loc ? R.drawable.ic_gps_fixed_white_24dp :
-						R.drawable.ic_gps_not_fixed_white_24dp);
-				this.binding.fab.setContentDescription(getResources().getString(
-						marker_fixed_to_loc ? R.string.action_unfix_from_location : R.string.action_fix_to_location
-				));
-				this.binding.fab.invalidate();
-			});
-		} else {
-			this.binding.fab.setVisibility(View.GONE);
-		}
-	}
+        if (isLocationEnabledAndAllowed()) {
+            this.binding.fab.setVisibility(View.VISIBLE);
+            runOnUiThread(() -> {
+                this.binding.fab.setImageResource(marker_fixed_to_loc ? R.drawable.ic_gps_fixed_white_24dp :
+                        R.drawable.ic_gps_not_fixed_white_24dp);
+                this.binding.fab.setContentDescription(getResources().getString(
+                        marker_fixed_to_loc ? R.string.action_unfix_from_location : R.string.action_fix_to_location
+                ));
+                this.binding.fab.invalidate();
+            });
+        } else {
+            this.binding.fab.setVisibility(View.GONE);
+        }
+    }
 }
\ No newline at end of file