diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 7b4f3ee28..d3bf9c3d5 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
     <!-- other group (for free) -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
index 821fc2f60..ef9b4e29f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/presenter/TransferPresenter.java
@@ -27,6 +27,8 @@ import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
@@ -351,8 +353,10 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         sentData = false;
         connectionClear();
 
+        String wifiSsid = getConnectedWifiSsid();
+
         keyTransferServerInteractor = new KeyTransferInteractor(DELIMITER_START, DELIMITER_END);
-        keyTransferServerInteractor.startServer(this, null);
+        keyTransferServerInteractor.startServer(this, wifiSsid);
 
         view.showWaitingForConnection();
         view.setShowDoneIcon(false);
@@ -365,6 +369,23 @@ public class TransferPresenter implements KeyTransferCallback, LoaderCallbacks<L
         return wifiNetwork.isConnected();
     }
 
+    private String getConnectedWifiSsid() {
+        WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        if (wifiManager == null) {
+            return null;
+        }
+        WifiInfo info = wifiManager.getConnectionInfo();
+        if (info == null) {
+            return null;
+        }
+        // getSSID will return the ssid in quotes if it is valid utf-8. we only return it in that case.
+        String ssid = info.getSSID();
+        if (ssid.charAt(0) != '"') {
+            return null;
+        }
+        return ssid.substring(1, ssid.length() -1);
+    }
+
     private void connectionClear() {
         if (keyTransferServerInteractor != null) {
             keyTransferServerInteractor.closeConnection();