diff --git a/src/gui/guiutility.cpp b/src/gui/guiutility.cpp
index f4b31a7af2..0a3ee6f0f4 100644
--- a/src/gui/guiutility.cpp
+++ b/src/gui/guiutility.cpp
@@ -44,7 +44,7 @@ bool Utility::openBrowser(const QUrl &url, QWidget *errorWidgetParent)
 
 bool Utility::openEmailComposer(const QString &subject, const QString &body, QWidget *errorWidgetParent)
 {
-    QUrl url(QLatin1String("mailto: "));
+    QUrl url(QLatin1String("mailto:"));
     url.setQueryItems({ { QLatin1String("subject"), subject },
         { QLatin1String("body"), body } });
 
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index ccfe5167eb..b43d77a4aa 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -518,7 +518,7 @@ void SocketApi::command_EMAIL_PRIVATE_LINK(const QString &localFile, SocketListe
     if (!url.isEmpty()) {
         Utility::openEmailComposer(
             tr("I shared something with you"),
-            url.toString(),
+            url.toString(QUrl::FullyEncoded),
             0);
     }
 }