diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d407a757..8fcc5440 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1600"
-    android:versionName="1.6">
+    android:versionCode="1619"
+    android:versionName="1.6.2 Beta">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22" />
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a5d85f90..6efd6b47 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -152,6 +152,7 @@
   <string name="device_rename_confirm">Premenovať</string>
   <string name="refresh">Obnoviť</string>
   <string name="unreachable_description">Toto spárované zariadenie nie je dosiahnuteľné. Prosím, uistite sa, že je pripojené do rovnakej siete.</string>
+  <string name="on_data_message">Zdá sa, že ste na mobilom dátovom pripojení. KDE Connect funguje iba na lokálnej sieti.</string>
   <string name="no_file_browser">Nie sú nainštalované žiadne prehliadače.</string>
   <string name="pref_plugin_telepathy">Poslať SMS</string>
   <string name="pref_plugin_telepathy_desc">Posielať textové správy z vášho počítača</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a552cd56..3b1b7035 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -165,6 +165,7 @@
   <string name="device_rename_confirm">Byt namn</string>
   <string name="refresh">Uppdatera</string>
   <string name="unreachable_description">Den här ihopparade apparaten kan inte nås. Försäkra dig om att den är ansluten till samma nätverk.</string>
+  <string name="on_data_message">Det verkar som om du använder en mobil dataanslutning. KDE-anslut fungerar bara på lokala nätverk.</string>
   <string name="no_file_browser">Det finns inga filbläddrare installerade.</string>
   <string name="pref_plugin_telepathy">Skicka SMS</string>
   <string name="pref_plugin_telepathy_desc">Skicka textmeddelanden från skrivbordet</string>
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
index 46969342..0e83fd7c 100644
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
@@ -119,11 +119,15 @@ public class SharePlugin extends Plugin {
                 final String defaultPath = ShareSettingsActivity.getDefaultDestinationDirectory().getAbsolutePath();
                 final String filename = customDestination? originalFilename : FilesHelper.findNonExistingNameForNewFile(defaultPath, originalFilename);
 
-                final String nameWithoutExtension = FilesHelper.getFileNameWithoutExt(filename);
+                String displayName = FilesHelper.getFileNameWithoutExt(filename);
                 final String mimeType = FilesHelper.getMimeTypeFromFile(filename);
 
+                if ("*/*".equals(mimeType)) {
+                    displayName = filename;
+                }
+
                 final DocumentFile destinationFolderDocument = ShareSettingsActivity.getDestinationDirectory(context);
-                final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, nameWithoutExtension);
+                final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, displayName);
                 final OutputStream destinationOutput = context.getContentResolver().openOutputStream(destinationDocument.getUri());
                 final Uri destinationUri = destinationDocument.getUri();