diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
index ab73f1a02..8ebb24a17 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
@@ -537,18 +537,46 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 //Text is copied pasted and the content is greater than the max of the instance
                 int max_car = MastodonHelper.getInstanceMaxChars(context);
                 if (count > max_car) {
-                    proceedToSplit[0] = true;
-                    ArrayList<String> splitText = ComposeHelper.splitToots(s.toString(), max_car);
-                    int statusListSize = statusList.size();
-                    int i = 0;
-                    for(String message: splitText) {
-                        if(i==0) {
+                    SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
+                    String defaultFormat = sharedpreferences.getString(context.getString(R.string.SET_THREAD_MESSAGE), context.getString(R.string.DEFAULT_THREAD_VALUE));
+                    //User asked to be prompted for threading long messages
+                    if(defaultFormat.compareToIgnoreCase("ASK") == 0) {
+                        AlertDialog.Builder threadConfirm = new MaterialAlertDialogBuilder(context);
+                        threadConfirm.setTitle(context.getString(R.string.thread_long_message));
+                        threadConfirm.setMessage(context.getString(R.string.thread_long_message_message));
+                        threadConfirm.setNegativeButton(R.string.thread_long_message_no, (dialog, which) -> dialog.dismiss());
+                        threadConfirm.setPositiveButton(R.string.thread_long_message_yes, (dialog, which) -> {
+                            String currentContent = holder.binding.content.getText().toString();
+                            ArrayList<String> splitText = ComposeHelper.splitToots(currentContent, max_car);
+                            holder.binding.content.setText(splitText.get(0));
+                            int statusListSize = statusList.size();
+                            int i = 0;
+                            for(String message: splitText) {
+                                if(i==0) {
+                                    i++;
+                                    continue;
+                                }
+                                manageDrafts.onItemDraftAdded(statusListSize+(i-1), message);
+                                buttonVisibility(holder);
+                                i++;
+                            }
+                            dialog.dismiss();
+                        });
+                        threadConfirm.show();
+                    } else if(defaultFormat.compareToIgnoreCase("ENABLE") == 0) { //User wants to automatically thread long messages
+                        proceedToSplit[0] = true;
+                        ArrayList<String> splitText = ComposeHelper.splitToots(s.toString(), max_car);
+                        int statusListSize = statusList.size();
+                        int i = 0;
+                        for(String message: splitText) {
+                            if(i==0) {
+                                i++;
+                                continue;
+                            }
+                            manageDrafts.onItemDraftAdded(statusListSize+(i-1), message);
+                            buttonVisibility(holder);
                             i++;
-                            continue;
                         }
-                        manageDrafts.onItemDraftAdded(statusListSize+(i-1), message);
-                        buttonVisibility(holder);
-                        i++;
                     }
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 41ccd0b8a..bd57b03a8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -706,6 +706,19 @@
     <string name="no_account_in_list">No accounts found for this list!</string>
     <string name="scheduled">Scheduled</string>
 
+
+    <string-array name="set_thread_message_value">
+        <item>Ask</item>
+        <item>Disable</item>
+        <item>Enable</item>
+    </string-array>
+
+    <string-array name="SET_THREAD_MESSAGE_VALUE" translatable="false">
+        <item>ASK</item>
+        <item>DISABLE</item>
+        <item>ENABLE</item>
+    </string-array>
+
     <string-array name="set_theme_mode_value">
         <item>Light</item>
         <item>Dark</item>
@@ -1065,6 +1078,7 @@
     <string name="SET_CAPITALIZE" translatable="false">SET_CAPITALIZE</string>
     <string name="SET_MENTIONS_AT_TOP" translatable="false">SET_MENTIONS_AT_TOP</string>
 
+    <string name="SET_THREAD_MESSAGE" translatable="false">SET_THREAD_MESSAGE</string>
     <string name="SET_THEME_BASE" translatable="false">SET_THEME_BASE</string>
     <string name="SET_DYNAMICCOLOR" translatable="false">SET_DYNAMICCOLOR</string>
     <string name="SET_CUSTOM_ACCENT" translatable="false">SET_CUSTOM_ACCENT</string>
@@ -1193,6 +1207,7 @@
     <string name="SET_NOTIFICATIONS_PER_CALL" translatable="false">SET_NOTIFICATIONS_PER_CALL</string>
     <string name="INSTANCE_INFO" translatable="false">INSTANCE_INFO</string>
     <string name="SET_INVIDIOUS" translatable="false">SET_INVIDIOUS</string>
+    <string name="DEFAULT_THREAD_VALUE" translatable="false">ASK</string>
     <string name="SET_INVIDIOUS_HOST" translatable="false">SET_INVIDIOUS_HOST</string>
     <string name="DEFAULT_INVIDIOUS_HOST" translatable="false">invidious.snopyta.org</string>
     <string name="SET_FILTER_UTM" translatable="false">SET_FILTER_UTM</string>
@@ -1857,6 +1872,11 @@
     <string name="create_domain_block">Create domain block</string>
     <string name="mute_tag">Are you sure to mute the tag %1$s?</string>
     <string name="type_of_theme">Pickup a mode for the theme</string>
+    <string name="thread_long_message">Divide long messages in replies</string>
+    <string name="thread_long_message_no">Don\'t divide it</string>
+    <string name="thread_long_message_yes">Divide the message</string>
+    <string name="thread_long_message_message">The message will be divided in several replies to follow your instance max characters.</string>
+
     <string name="pref_customize">Customize colors</string>
     <string name="pref_customize_summary">Allow to set your custom colors for themes.</string>
     <string name="set_dynamic_color">Dynamic Color</string>
diff --git a/app/src/main/res/xml/pref_compose.xml b/app/src/main/res/xml/pref_compose.xml
index 6054966a1..8d5711e39 100644
--- a/app/src/main/res/xml/pref_compose.xml
+++ b/app/src/main/res/xml/pref_compose.xml
@@ -14,6 +14,17 @@
         app:summary="@string/set_capitalize_indication"
         app:title="@string/set_capitalize" />
 
+    <ListPreference
+        app:defaultValue="ASK"
+        app:dialogTitle="@string/thread_long_message"
+        app:entries="@array/set_thread_message_value"
+        app:entryValues="@array/SET_THREAD_MESSAGE_VALUE"
+        app:iconSpaceReserved="false"
+        app:key="@string/SET_THREAD_MESSAGE"
+        app:title="@string/thread_long_message"
+        app:useSimpleSummaryProvider="true" />
+
+
     <SwitchPreferenceCompat
         app:defaultValue="false"
         app:iconSpaceReserved="false"