diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 9d1f6583..5e232913 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.smsmessenger.activities
 
 import android.os.Bundle
 import com.simplemobiletools.commons.extensions.applyColorFilter
+import com.simplemobiletools.commons.extensions.onTextChangeListener
 import com.simplemobiletools.commons.extensions.value
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter
@@ -38,16 +39,21 @@ class ThreadActivity : SimpleActivity() {
             items.add(it)
         }
 
-        ThreadAdapter(this, items, thread_messages_list, thread_messages_fastscroller) {
-
-        }.apply {
-            thread_messages_list.adapter = this
-        }
+        val adapter = ThreadAdapter(this, items, thread_messages_list, thread_messages_fastscroller) {}
+        thread_messages_list.adapter = adapter
 
         thread_type_message.setColors(config.textColor, config.primaryColor, config.backgroundColor)
         thread_send_message.applyColorFilter(config.textColor)
+
+        thread_type_message.onTextChangeListener {
+            thread_send_message.isClickable = it.isNotEmpty()
+        }
+
         thread_send_message.setOnClickListener {
             val msg = thread_type_message.value
+            if (msg.isEmpty()) {
+                return@setOnClickListener
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 4d01a45d..7cc79d8e 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -62,6 +62,7 @@
         android:layout_marginEnd="@dimen/small_margin"
         android:alpha="0.9"
         android:background="?selectableItemBackgroundBorderless"
+        android:clickable="false"
         android:padding="@dimen/medium_margin"
         android:src="@drawable/ic_send_vector" />