diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
index f4c563e40..79e69a51d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
@@ -120,7 +120,8 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
     private void prepareIntent() {
         shareIntent = new Intent(Intent.ACTION_SEND);
         shareIntent.setType("text/plain");
-        shareIntent.putExtra(Intent.EXTRA_SUBJECT, getResources().getString(R.string.nc_share_subject));
+        shareIntent.putExtra(Intent.EXTRA_SUBJECT, String.format(getResources().getString(R.string.nc_share_subject),
+                getResources().getString(R.string.app_name)));
     }
 
     private void prepareMenu() {
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
index a5ceb7bd6..a113bffd3 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
@@ -253,6 +253,7 @@ public class EntryMenuController extends BaseController {
             case 11:
             case 2:
                 labelText = getResources().getString(R.string.nc_call_name);
+                editText.setInputType(InputType.TYPE_CLASS_TEXT);
                 break;
             case 4:
                 labelText = getResources().getString(R.string.nc_new_password);
@@ -267,12 +268,13 @@ public class EntryMenuController extends BaseController {
                 break;
             case 10:
                 labelText = getResources().getString(R.string.nc_conversation_link);
+                editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
                 break;
             default:
                 break;
         }
 
         textFieldBoxes.setLabelText(labelText);
-        editText.requestFocus();
+        textFieldBoxes.requestFocus();
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/events/ShowScreenEvent.java b/app/src/main/java/com/nextcloud/talk/events/ShowScreenEvent.java
index 2d31057fa..4f721fea1 100644
--- a/app/src/main/java/com/nextcloud/talk/events/ShowScreenEvent.java
+++ b/app/src/main/java/com/nextcloud/talk/events/ShowScreenEvent.java
@@ -27,15 +27,15 @@ import lombok.Data;
 
 @Data
 public class ShowScreenEvent {
-    public enum ScreenType {
-        CONTACTS_SCREEN
-    }
-
-    @Nullable private final Bundle bundle;
+    @Nullable
+    private final Bundle bundle;
     private final ScreenType screenType;
-
     public ShowScreenEvent(ScreenType screenType, @Nullable Bundle bundle) {
         this.bundle = bundle;
         this.screenType = screenType;
     }
+
+    public enum ScreenType {
+        CONTACTS_SCREEN
+    }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java
index 20d613c01..0277ab67a 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/ShareUtils.java
@@ -55,10 +55,6 @@ public class ShareUtils {
             if (!TextUtils.isEmpty(password)) {
                 shareString += String.format(context.getResources().getString(R.string.nc_share_text_pass), password);
             }
-
-            shareString += String.format(context.getResources().getString(R.string.nc_talk_soon), userEntity
-                    .getDisplayName()
-            );
         }
 
         return shareString;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25c248b09..025230064 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -126,11 +126,9 @@
     <string name="nc_proceed">Proceed</string>
     <string name="nc_call_name_is_same">The name you entered is the same as the existing one</string>
     <string name="nc_wrong_link">Conversation link is not valid</string>
-    <string name="nc_share_text">Hello,\n\nI would like you to join a call with me.\n\nYou can join this call via
-        %1$s/index.php/call/%2$s</string>
-    <string name="nc_talk_soon">\n\nTalk soon,\n %1$s</string>
-    <string name="nc_share_subject">Call invitation</string>
-    <string name="nc_share_text_pass">\n\nPassword for the call is: %1$s</string>
+    <string name="nc_share_text">Join the conversation at %1$s/index.php/call/%2$s</string>
+    <string name="nc_share_subject">%1$s invitation</string>
+    <string name="nc_share_text_pass">\nPassword: %1$s</string>
 
     <!-- Magical stuff -->
     <string name="nc_empty"></string>