diff --git a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 66c7a29e..176b1bfa 100644
--- a/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/IceCubesApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -69,7 +69,7 @@
       "location" : "https://github.com/Dimillian/TextView",
       "state" : {
         "branch" : "main",
-        "revision" : "22eec87ccac1270557b2b446fddc13c311bae5e7"
+        "revision" : "4353041d4412fde05748e7dc362396477a0e24a5"
       }
     }
   ],
diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift
index f39915a6..1a37d24c 100644
--- a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift
+++ b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift
@@ -117,6 +117,9 @@ struct SettingsTabs: View {
       Toggle(isOn: $preferences.isOpenAIEnabled) {
         Label("settings.other.hide-openai", systemImage: "faxmachine")
       }
+      Toggle(isOn: $preferences.isSocialKeyboardEnabled) {
+        Label("settings.other.social-keyboard", systemImage: "keyboard")
+      }
     }
     .listRowBackground(theme.primaryBackgroundColor)
   }
diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
index c386e4cb..9a6d8d78 100644
--- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.rate" = "Bewerte Ice Cubes";
 "settings.section.other" = "Other";
 "settings.other.hide-openai" = "Enable 🤖 helper";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "Entdecken";
diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
index ea31eadb..b753a238 100644
--- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.rate" = "Rate Ice Cubes";
 "settings.section.other" = "Other";
 "settings.other.hide-openai" = "Enable 🤖 helper";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "Explore";
diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
index 354fcccb..75616548 100644
--- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.rate" = "Valora Ice Cubes";
 "settings.section.other" = "Other";
 "settings.other.hide-openai" = "Enable 🤖 helper";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "Explorar";
diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
index 4a6b9557..81c1f177 100644
--- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.rate" = "Valuta Ice Cubes";
 "settings.section.other" = "Other";
 "settings.other.hide-openai" = "Enable 🤖 helper";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "Esplora";
diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
index b845efe1..4428af05 100644
--- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.title" = "Instellingen";
 "settings.section.other" = "Overig";
 "settings.other.hide-openai" = "Schakel 🤖 hulp in";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "Ontdekken";
diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
index 7c11a2a5..ce589d83 100644
--- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
+++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
@@ -102,6 +102,7 @@
 "settings.rate" = "给 Ice Cubes 评分";
 "settings.section.other" = "其它";
 "settings.other.hide-openai" = "启用写作助手 🤖";
+"settings.other.social-keyboard" = "Enable Social Keyboard";
 
 // MARK: Tabs
 "tab.explore" = "探索";
diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift
index 6846af6d..0986129b 100644
--- a/Packages/Env/Sources/Env/UserPreferences.swift
+++ b/Packages/Env/Sources/Env/UserPreferences.swift
@@ -17,6 +17,7 @@ public class UserPreferences: ObservableObject {
   @AppStorage("show_translate_button_inline") public var showTranslateButton: Bool = true
   @AppStorage("is_open_ai_enabled") public var isOpenAIEnabled: Bool = true
   @AppStorage("recently_used_languages") public var recentlyUsedLanguages: [String] = []
+  @AppStorage("social_keyboard_composer") public var isSocialKeyboardEnabled: Bool = true
 
   public var pushNotificationsCount: Int {
     get {
diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
index 42420bc5..0b5e4ef9 100644
--- a/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
+++ b/Packages/Status/Sources/Status/Editor/StatusEditorView.swift
@@ -40,7 +40,7 @@ public struct StatusEditorView: View {
             TextView($viewModel.statusText, $viewModel.selectedRange, $viewModel.markedTextRange)
               .placeholder(String(localized: "status.editor.text.placeholder"))
               .font(Font.scaledBodyUIFont)
-              .keyboardType(.twitter)
+              .setKeyboardType(preferences.isSocialKeyboardEnabled ? .twitter : .default)
               .padding(.horizontal, .layoutPadding)
             StatusEditorMediaView(viewModel: viewModel)
             if let status = viewModel.embeddedStatus {