diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 201d9a266..cc40cd19d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -2168,8 +2168,8 @@ class ChatController(args: Bundle) :
                     }
                     R.id.action_forward_message -> {
                         val bundle = Bundle()
-                        bundle.putBoolean("forwardMessage", true)
-                        bundle.putString("forwardMessageText", message?.text)
+                        bundle.putBoolean(BundleKeys.KEY_FORWARD_MSG_FLAG, true)
+                        bundle.putString(BundleKeys.KEY_FORWARD_MSG_TEXT, message?.text)
                         getRouter().pushController(
                             RouterTransaction.with(ConversationsListController(bundle))
                                 .pushChangeHandler(HorizontalChangeHandler())
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
index 4462e4e75..fd24e0c49 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
@@ -209,7 +209,7 @@ public class ConversationsListController extends BaseController implements Searc
     public ConversationsListController(Bundle bundle) {
         super();
         setHasOptionsMenu(true);
-        forwardMessage = bundle.getBoolean("forwardMessage");
+        forwardMessage = bundle.getBoolean(BundleKeys.INSTANCE.getKEY_FORWARD_MSG_FLAG());
         this.bundle = bundle;
     }
 
@@ -761,8 +761,8 @@ public class ConversationsListController extends BaseController implements Searc
             if (showShareToScreen) {
                 shareToScreenWasShown = true;
                 handleSharedData();
-            }else if (forwardMessage) {
-                openConversation(bundle.getString("forwardMessageText"));
+            } else if (forwardMessage) {
+                openConversation(bundle.getString(BundleKeys.INSTANCE.getKEY_FORWARD_MSG_TEXT()));
             } else {
                 openConversation();
             }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt
index a262c75e8..30518a126 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt
@@ -68,4 +68,6 @@ object BundleKeys {
     val KEY_SHARED_TEXT = "KEY_SHARED_TEXT"
     val KEY_GEOCODING_QUERY = "KEY_GEOCODING_QUERY"
     val KEY_META_DATA = "KEY_META_DATA"
+    val KEY_FORWARD_MSG_FLAG = "KEY_FORWARD_MSG_FLAG"
+    val KEY_FORWARD_MSG_TEXT = "KEY_FORWARD_MSG_TEXT"
 }