diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index ad9615e20a..cffd8d030b 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -2,6 +2,7 @@ package chat.rocket.android.chatroom.presentation
 
 import android.graphics.Bitmap
 import android.net.Uri
+import android.view.KeyEvent
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.SubscriptionTypeEvent
@@ -20,9 +21,11 @@ import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.emoji.EmojiRepository
+import chat.rocket.android.emoji.PhysicalKeyboardConfig
 import chat.rocket.android.helper.MessageHelper
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.preferences.interactor.PhysicalKeyboardConfigInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.JobSchedulerInteractor
@@ -103,10 +106,12 @@ class ChatRoomPresenter @Inject constructor(
     private val jobSchedulerInteractor: JobSchedulerInteractor,
     private val messageHelper: MessageHelper,
     private val dbManager: DatabaseManager,
+    private val physicalKeyboardConfigInteractor: PhysicalKeyboardConfigInteractor,
     getSettingsInteractor: GetSettingsInteractor,
     serverInteractor: GetCurrentServerInteractor,
     factory: ConnectionManagerFactory
 ) {
+
     private val currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
@@ -1301,6 +1306,7 @@ class ChatRoomPresenter @Inject constructor(
     fun clearDraftMessage() {
         localRepository.clear(draftKey)
     }
+
     /**
      * Get unfinished message from local repository, when user left chat room without
      * sending a message and now the user is back.
@@ -1310,4 +1316,36 @@ class ChatRoomPresenter @Inject constructor(
     fun getDraftUnfinishedMessage(): String? {
         return localRepository.get(draftKey)
     }
+
+    fun onKeyEvent(keyCode: Int, keyEvent: KeyEvent): Boolean {
+        return when (keyCode) {
+            KeyEvent.KEYCODE_ENTER -> {
+                when (physicalKeyboardConfigInteractor.getConfig()) {
+                    is PhysicalKeyboardConfig.Enter -> {
+                        if (!keyEvent.isShiftPressed && !keyEvent.isCtrlPressed) {
+                            view.sendMessage()
+                            true
+                        } else {
+                            false
+                        }
+                    }
+                    is PhysicalKeyboardConfig.EnterPlusControl -> {
+                        if (keyEvent.isCtrlPressed) {
+                            view.sendMessage()
+                        }
+                        true
+                    }
+                    is PhysicalKeyboardConfig.EnterPlusShift -> {
+                        if (keyEvent.isShiftPressed) {
+                            view.sendMessage()
+                        }
+                        true
+                    }
+                    else -> false
+                }
+            }
+            else -> false
+        }
+    }
+
 }
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
index 15f241b2cb..572917f7d1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
@@ -9,7 +9,6 @@ import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.core.internal.realtime.socket.model.State
-import chat.rocket.core.model.ChatRoom
 
 interface ChatRoomView : LoadingView, MessageView {
 
@@ -42,6 +41,8 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun sendMessage(text: String)
 
+    fun sendMessage()
+
     /**
      * Shows the username(s) of the user(s) who is/are typing in the chat room.
      *
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index 246cc76705..394a01a7c4 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -315,6 +315,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         text_message.addTextChangedListener(EmojiKeyboardPopup.EmojiTextWatcher(text_message))
+        text_message.setOnKeyListener { _, keyCode, event -> presenter.onKeyEvent(keyCode, event) }
     }
 
     override fun onDestroyView() {
@@ -462,7 +463,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-
     override fun sendMessage(text: String) {
         ui {
             if (!text.isBlank()) {
@@ -475,6 +475,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    override fun sendMessage() {
+        var textMessage = citation ?: ""
+        textMessage += text_message.textContent
+        sendMessage(textMessage)
+    }
+
     override fun showTypingStatus(usernameList: List<String>) {
         ui {
             when (usernameList.size) {
@@ -514,7 +520,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-
     override fun clearMessageComposition(deleteMessage: Boolean) {
         ui {
             citation = null
@@ -866,9 +871,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             }
 
             button_send.setOnClickListener {
-                var textMessage = citation ?: ""
-                textMessage += text_message.textContent
-                sendMessage(textMessage)
+                sendMessage()
             }
 
             button_show_attachment_options.setOnClickListener {
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
index 9fbe051396..330a3c81ca 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
@@ -22,28 +22,29 @@ import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.SharedPreferencesLocalRepository
+import chat.rocket.android.preferences.repository.PhysicalKeyboardConfigRepository
+import chat.rocket.android.preferences.repository.SharedPrefPhysicalKeyboardConfigRepository
 import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.AccountsRepository
 import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import chat.rocket.android.server.domain.AnalyticsTrackingRepository
+import chat.rocket.android.server.domain.BasicAuthRepository
 import chat.rocket.android.server.domain.ChatRoomsRepository
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetBasicAuthInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.JobSchedulerInteractor
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.android.server.domain.MultiServerTokenRepository
 import chat.rocket.android.server.domain.PermissionsRepository
+import chat.rocket.android.server.domain.SaveBasicAuthInteractor
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
-import chat.rocket.android.server.domain.BasicAuthRepository
-import chat.rocket.android.server.domain.GetBasicAuthInteractor
-import chat.rocket.android.server.domain.SaveBasicAuthInteractor
-import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
 import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
 import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
 import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
@@ -53,17 +54,17 @@ import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepos
 import chat.rocket.android.server.infraestructure.SharedPreferencesPermissionsRepository
 import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
 import chat.rocket.android.server.infraestructure.SharedPrefsAnalyticsTrackingRepository
+import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
 import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRepository
 import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
-import chat.rocket.android.util.HttpLoggingInterceptor
 import chat.rocket.android.util.BasicAuthenticatorInterceptor
+import chat.rocket.android.util.HttpLoggingInterceptor
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
 import chat.rocket.common.internal.ISO8601Date
 import chat.rocket.common.model.TimestampAdapter
 import chat.rocket.common.util.CalendarISO8601Converter
-import chat.rocket.common.util.Logger
 import chat.rocket.common.util.NoOpLogger
 import chat.rocket.common.util.PlatformLogger
 import chat.rocket.core.internal.AttachmentAdapterFactory
@@ -124,7 +125,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpClient(logger: HttpLoggingInterceptor, basicAuthenticator: BasicAuthenticatorInterceptor): OkHttpClient {
+    fun provideOkHttpClient(
+        logger: HttpLoggingInterceptor,
+        basicAuthenticator: BasicAuthenticatorInterceptor
+    ): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(logger)
             .addInterceptor(basicAuthenticator)
@@ -145,13 +149,16 @@ class AppModule {
         return OkHttpImagePipelineConfigFactory.newBuilder(context, okHttpClient)
             .setRequestListeners(listeners)
             .setDownsampleEnabled(true)
-            .experiment().setPartialImageCachingEnabled(true).build()
+            .experiment()
+            .setPartialImageCachingEnabled(true)
+            .build()
     }
 
     @Provides
     @Singleton
     fun provideDraweeConfig(): DraweeConfig {
-        return DraweeConfig.newBuilder().build()
+        return DraweeConfig.newBuilder()
+            .build()
     }
 
     @Provides
@@ -168,9 +175,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideSharedPreferences(context: Application) =
-        context.getSharedPreferences("rocket.chat", Context.MODE_PRIVATE)
-
+    fun provideSharedPreferences(context: Application) = context.getSharedPreferences(
+        "rocket.chat",
+        Context.MODE_PRIVATE
+    )
 
     @Provides
     @ForMessages
@@ -195,6 +203,14 @@ class AppModule {
         return SharedPrefsAnalyticsTrackingRepository(prefs)
     }
 
+    @Provides
+    @Singleton
+    fun provideSharedPrefPhysicalKeyboardConfigRepository(
+        prefs: SharedPreferences
+    ): PhysicalKeyboardConfigRepository {
+        return SharedPrefPhysicalKeyboardConfigRepository(prefs)
+    }
+
     @Provides
     @ForAuthentication
     fun provideConnectingServerRepository(prefs: SharedPreferences): CurrentServerRepository {
@@ -294,10 +310,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideBasicAuthRepository (
+    fun provideBasicAuthRepository(
         preferences: SharedPreferences,
         moshi: Moshi
-    ): BasicAuthRepository = 
+    ): BasicAuthRepository =
         SharedPrefsBasicAuthRepository(preferences, moshi)
 
     @Provides
diff --git a/app/src/main/java/chat/rocket/android/preferences/interactor/PhysicalKeyboardConfigInteractor.kt b/app/src/main/java/chat/rocket/android/preferences/interactor/PhysicalKeyboardConfigInteractor.kt
new file mode 100644
index 0000000000..b24c12e044
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/preferences/interactor/PhysicalKeyboardConfigInteractor.kt
@@ -0,0 +1,17 @@
+package chat.rocket.android.preferences.interactor
+
+import chat.rocket.android.emoji.PhysicalKeyboardConfig
+import chat.rocket.android.preferences.repository.PhysicalKeyboardConfigRepository
+import javax.inject.Inject
+
+class PhysicalKeyboardConfigInteractor @Inject constructor(
+    private val physicalKeyboardConfigRepository: PhysicalKeyboardConfigRepository
+) {
+
+    fun getConfig() = physicalKeyboardConfigRepository.getConfig()
+
+    fun saveConfig(physicalKeyboardConfig: PhysicalKeyboardConfig) {
+        physicalKeyboardConfigRepository.saveConfig(physicalKeyboardConfig)
+    }
+
+}
diff --git a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt b/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt
index 38eba6e6db..10728ac509 100644
--- a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt
@@ -1,13 +1,26 @@
 package chat.rocket.android.preferences.presentation
 
+import chat.rocket.android.R
+import chat.rocket.android.emoji.PhysicalKeyboardConfig
+import chat.rocket.android.preferences.interactor.PhysicalKeyboardConfigInteractor
 import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import javax.inject.Inject
 
 class PreferencesPresenter @Inject constructor(
     private val view: PreferencesView,
-    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor
+    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor,
+    private val physicalKeyboardConfigInteractor: PhysicalKeyboardConfigInteractor
 ) {
 
+    private var physicalKeyboardConfig: PhysicalKeyboardConfig = PhysicalKeyboardConfig.EnterPlusControl
+        set(value) {
+            field = value
+            physicalKeyboardConfigInteractor.saveConfig(value)
+        }
+        get() = physicalKeyboardConfigInteractor.getConfig()
+
+    private var tempPhysicalKeyboardConfig = physicalKeyboardConfig
+
     fun loadAnalyticsTrackingInformation() {
         view.setupAnalyticsTrackingView(analyticsTrackingInteractor.get())
     }
@@ -19,4 +32,27 @@ class PreferencesPresenter @Inject constructor(
     fun disableAnalyticsTracking() {
         analyticsTrackingInteractor.save(false)
     }
-}
\ No newline at end of file
+
+    fun getPhysicalKeyboardRadioId(): Int {
+        return when (physicalKeyboardConfig) {
+            PhysicalKeyboardConfig.Enter -> R.id.radio_physical_keyboard_enter
+            PhysicalKeyboardConfig.EnterPlusShift -> R.id.radio_physical_keyboard_enter_shift
+            PhysicalKeyboardConfig.EnterPlusControl -> R.id.radio_physical_keyboard_enter_control
+            else -> R.id.radio_physical_keyboard_disabled
+        }
+    }
+
+    fun onPhysicalKeyboardRadioChange(checkedId: Int) {
+        tempPhysicalKeyboardConfig = when (checkedId) {
+            R.id.radio_physical_keyboard_enter -> PhysicalKeyboardConfig.Enter
+            R.id.radio_physical_keyboard_enter_shift -> PhysicalKeyboardConfig.EnterPlusShift
+            R.id.radio_physical_keyboard_enter_control -> PhysicalKeyboardConfig.EnterPlusControl
+            else -> PhysicalKeyboardConfig.Disable
+        }
+    }
+
+    fun onPhysicalKeyboardDialogOkClicked() {
+        physicalKeyboardConfig = tempPhysicalKeyboardConfig
+    }
+
+}
diff --git a/app/src/main/java/chat/rocket/android/preferences/repository/PhysicalKeyboardConfigRepository.kt b/app/src/main/java/chat/rocket/android/preferences/repository/PhysicalKeyboardConfigRepository.kt
new file mode 100644
index 0000000000..b77f312f39
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/preferences/repository/PhysicalKeyboardConfigRepository.kt
@@ -0,0 +1,11 @@
+package chat.rocket.android.preferences.repository
+
+import chat.rocket.android.emoji.PhysicalKeyboardConfig
+
+interface PhysicalKeyboardConfigRepository {
+
+    fun getConfig(): PhysicalKeyboardConfig
+
+    fun saveConfig(physicalKeyboardConfig: PhysicalKeyboardConfig)
+
+}
diff --git a/app/src/main/java/chat/rocket/android/preferences/repository/SharedPrefPhysicalKeyboardConfigRepository.kt b/app/src/main/java/chat/rocket/android/preferences/repository/SharedPrefPhysicalKeyboardConfigRepository.kt
new file mode 100644
index 0000000000..c6ccbb6b10
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/preferences/repository/SharedPrefPhysicalKeyboardConfigRepository.kt
@@ -0,0 +1,30 @@
+package chat.rocket.android.preferences.repository
+
+import android.content.SharedPreferences
+import chat.rocket.android.emoji.PhysicalKeyboardConfig
+import javax.inject.Inject
+
+class SharedPrefPhysicalKeyboardConfigRepository @Inject constructor(
+    private val sharedPreferences: SharedPreferences
+) : PhysicalKeyboardConfigRepository {
+
+    override fun saveConfig(physicalKeyboardConfig: PhysicalKeyboardConfig) {
+        sharedPreferences.edit()
+            .putInt(PHYSICAL_KEYBOARD_CONFIG_KEY, physicalKeyboardConfig.state)
+            .apply()
+    }
+
+    override fun getConfig(): PhysicalKeyboardConfig {
+        return PhysicalKeyboardConfig.Disable.stateToConfig(
+            sharedPreferences.getInt(
+                PHYSICAL_KEYBOARD_CONFIG_KEY,
+                PhysicalKeyboardConfig.EnterPlusControl.state
+            )
+        )
+    }
+
+    companion object {
+        const val PHYSICAL_KEYBOARD_CONFIG_KEY = "PHYSICAL_KEYBOARD_CONFIG_KEY"
+    }
+
+}
diff --git a/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt b/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
index 22abe36122..b25960fc3f 100644
--- a/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
+++ b/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.preferences.ui
 
+import android.app.AlertDialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,16 +16,37 @@ import chat.rocket.android.preferences.presentation.PreferencesView
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_preferences.*
+import kotlinx.android.synthetic.main.physical_keyboard_config_dialog.view.*
 import javax.inject.Inject
 
 internal const val TAG_PREFERENCES_FRAGMENT = "PreferencesFragment"
 
 class PreferencesFragment : Fragment(), PreferencesView {
+
     @Inject
     lateinit var presenter: PreferencesPresenter
     @Inject
     lateinit var analyticsManager: AnalyticsManager
 
+    private val physicalKeyboardDialog by lazy(LazyThreadSafetyMode.NONE) {
+        val dialogLayout = layoutInflater.inflate(R.layout.physical_keyboard_config_dialog, null)
+        dialogLayout.radio_physical_keyboard.setOnCheckedChangeListener { _, checkedId ->
+            presenter.onPhysicalKeyboardRadioChange(checkedId)
+        }
+        dialogLayout.radio_physical_keyboard.check(presenter.getPhysicalKeyboardRadioId())
+        AlertDialog.Builder(context)
+            .setTitle(R.string.physical_keyboard_preference_title)
+            .setPositiveButton(R.string.msg_ok) { dialog, _ ->
+                presenter.onPhysicalKeyboardDialogOkClicked()
+                dialog.dismiss()
+            }
+            .setNegativeButton(R.string.msg_cancel) { dialog, _ ->
+                dialog.dismiss()
+            }
+            .setView(dialogLayout)
+            .create()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
@@ -84,6 +106,16 @@ class PreferencesFragment : Fragment(), PreferencesView {
                 presenter.disableAnalyticsTracking()
             }
         }
+        physical_keyboard_root.setOnClickListener {
+            physicalKeyboardDialog.show()
+        }
+    }
+
+    override fun onDestroyView() {
+        if (physicalKeyboardDialog.isShowing) {
+            physicalKeyboardDialog.dismiss()
+        }
+        super.onDestroyView()
     }
 
     companion object {
diff --git a/app/src/main/res/layout/fragment_preferences.xml b/app/src/main/res/layout/fragment_preferences.xml
index df859fb237..6a5c7d62af 100644
--- a/app/src/main/res/layout/fragment_preferences.xml
+++ b/app/src/main/res/layout/fragment_preferences.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="16dp"
     tools:context="preferences.ui.PreferencesFragment">
 
     <com.wang.avi.AVLoadingIndicatorView
@@ -24,6 +24,8 @@
         android:id="@+id/text_analytics_tracking"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:text="@string/msg_analytics_tracking"
         android:textColor="@color/colorPrimaryText"
         android:textSize="16sp"
@@ -34,6 +36,7 @@
         android:id="@+id/text_analytics_tracking_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:text="@string/msg_send_analytics_tracking"
         android:textColor="@color/colorSecondaryText"
         android:textSize="12sp"
@@ -44,9 +47,54 @@
         android:id="@+id/switch_analytics_tracking"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
         android:checked="true"
         app:layout_constraintBottom_toBottomOf="@+id/text_analytics_tracking_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_analytics_tracking" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="8dp"
+        android:background="@color/colorDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_analytics_tracking_description" />
+
+    <LinearLayout
+        android:id="@+id/physical_keyboard_root"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/divider">
+
+        <TextView
+            android:id="@+id/text_physical_keyboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:text="@string/physical_keyboard_preference_title"
+            android:textColor="@color/colorPrimaryText"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/text_physical_keyboard_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:text="@string/physical_keyboard_preference_description"
+            android:textColor="@color/colorSecondaryText"
+            android:textSize="12sp" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/physical_keyboard_config_dialog.xml b/app/src/main/res/layout/physical_keyboard_config_dialog.xml
new file mode 100644
index 0000000000..9c4afa0c97
--- /dev/null
+++ b/app/src/main/res/layout/physical_keyboard_config_dialog.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RadioGroup
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/radio_physical_keyboard"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <RadioButton
+        android:id="@+id/radio_physical_keyboard_enter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/dialog_physical_keyboard_enter"
+        android:textSize="18sp" />
+
+    <RadioButton
+        android:id="@+id/radio_physical_keyboard_enter_shift"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/dialog_physical_keyboard_enter_shift"
+        android:textSize="18sp" />
+
+    <RadioButton
+        android:id="@+id/radio_physical_keyboard_enter_control"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/dialog_physical_keyboard_enter_control"
+        android:textSize="18sp" />
+
+    <RadioButton
+        android:id="@+id/radio_physical_keyboard_disabled"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/dialog_physical_keyboard_disable"
+        android:textSize="18sp" />
+
+</RadioGroup>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 796aa664c9..36c5ae8b83 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -339,4 +339,10 @@
     <string name="submit">einreichen</string>
     <string name="required">*erforderlich</string>
     <string name="report_sent">Ihr Bericht wurde gesendet!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Deaktivieren</string>
+    <string name="physical_keyboard_preference_title">Physische Tastatur</string>
+    <string name="physical_keyboard_preference_description">Konfiguration zum Senden einer Nachricht von einer physischen Tastatur</string>
+
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ee7c2b76e4..d2faf2f2bb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -343,5 +343,11 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Inhabilitar</string>
+    <string name="physical_keyboard_preference_title">Teclado físico</string>
+    <string name="physical_keyboard_preference_description">Configuraciones para enviar un mensaje desde un teclado físico.</string>
+
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9e047cc769..fbfa20e98c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -346,5 +346,11 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
     <string name="required">*required</string> <!-- TODO - Add proper translation -->
-    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Désactiver</string>
+    <string name="physical_keyboard_preference_title">Clavier physique</string>
+    <string name="physical_keyboard_preference_description">Configuration pour l\'envoi d\'un message à partir d\'un clavier physique</string>
+
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 49dbfa40ee..5f210f7776 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -345,4 +345,10 @@
     <string name="submit">जमा करें</string>
     <string name="required">* आवश्यक</string>
     <string name="report_sent">आपकी रिपोर्ट भेज दी गई है!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">अक्षम</string>
+    <string name="physical_keyboard_preference_title">भौतिक कीबोर्ड</string>
+    <string name="physical_keyboard_preference_description">भौतिक कीबोर्ड के साथ संदेश भेजने के लिए विन्यास</string>
+
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6ed5e180d7..1bcdcc5c52 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -340,4 +340,10 @@
     <string name="submit">Invia</string>
     <string name="required">*necessario</string>
     <string name="report_sent">Il tuo resoconto è stato inviato!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Disattivare</string>
+    <string name="physical_keyboard_preference_title">Tastiera fisica</string>
+    <string name="physical_keyboard_preference_description">Configurazione per l\'invio di un messaggio con una tastiera fisica</string>
+
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 45d3333f19..d534dcc432 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -347,5 +347,11 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">無効にする</string>
+    <string name="physical_keyboard_preference_title">物理キーボード</string>
+    <string name="physical_keyboard_preference_description">物理キーボードでメッセージを送信するための設定</string>
+
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index de57e7bcb3..550768e559 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -345,4 +345,10 @@
     <string name="submit">Enviar</string>
     <string name="required">*obrigatório</string>
     <string name="report_sent">A mensagem foi reportada!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Desabilitar</string>
+    <string name="physical_keyboard_preference_title">Teclado físico</string>
+    <string name="physical_keyboard_preference_description">Configuração para enviar uma mensagem com um teclado físico</string>
+
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index aae058fe45..59027cd365 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -342,4 +342,10 @@
     <string name="submit">Отправить</string>
     <string name="required">*требуется</string>
     <string name="report_sent">Ваша жалоба была отправлена!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">запрещать</string>
+    <string name="physical_keyboard_preference_title">Физическая клавиатура</string>
+    <string name="physical_keyboard_preference_description">Конфигурация для отправки сообщения с физической клавиатуры</string>
+
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2a0a4aed48..e6696457d0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -345,5 +345,11 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Devre dışı</string>
+    <string name="physical_keyboard_preference_title">Fiziksel klavye</string>
+    <string name="physical_keyboard_preference_description">Fiziksel klavyeyle mesaj göndermek için yapılandırın</string>
+
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 19881aafe6..df5298b6d7 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -343,5 +343,11 @@
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
     <string name="required">*required</string> <!-- TODO - Add proper translation -->
-    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="dialog_physical_keyboard_disable">Відключити</string>
+    <string name="physical_keyboard_preference_title">Фізична клавіатура</string>
+    <string name="physical_keyboard_preference_description">Конфігурація для надсилання повідомлень з фізичної клавіатури</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad457877fd..ff2ec33561 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -360,4 +360,13 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="submit">Submit</string>
     <string name="required">*required</string>
     <string name="report_sent">Your report has been sent!</string>
+
+    <!-- Physical Keyboard Preferences -->
+    <string name="physical_keyboard_preference_title">Physical Keyboard</string>
+    <string name="physical_keyboard_preference_description">Configuration for sending a message from a physical keyboard</string>
+    <string name="dialog_physical_keyboard_enter" translatable="false">Enter</string>
+    <string name="dialog_physical_keyboard_enter_shift" translatable="false">Enter + Shift</string>
+    <string name="dialog_physical_keyboard_enter_control" translatable="false">Enter + Control</string>
+    <string name="dialog_physical_keyboard_disable">Disable</string>
+
 </resources>
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/PhysicalKeyboardConfig.kt b/emoji/src/main/java/chat/rocket/android/emoji/PhysicalKeyboardConfig.kt
new file mode 100644
index 0000000000..19a98a45fd
--- /dev/null
+++ b/emoji/src/main/java/chat/rocket/android/emoji/PhysicalKeyboardConfig.kt
@@ -0,0 +1,19 @@
+package chat.rocket.android.emoji
+
+sealed class PhysicalKeyboardConfig(val state: Int) {
+
+    fun stateToConfig(state: Int): PhysicalKeyboardConfig {
+        return when (state) {
+            0 -> Enter
+            1 -> EnterPlusShift
+            2 -> EnterPlusControl
+            else -> Disable
+        }
+    }
+
+    object Enter : PhysicalKeyboardConfig(0)
+    object EnterPlusShift : PhysicalKeyboardConfig(1)
+    object EnterPlusControl : PhysicalKeyboardConfig(2)
+    object Disable : PhysicalKeyboardConfig(3)
+
+}