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 5d037145..395a6a3a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -23,7 +23,6 @@ import android.view.inputmethod.EditorInfo
 import android.widget.LinearLayout
 import android.widget.LinearLayout.LayoutParams
 import android.widget.RelativeLayout
-import android.widget.Toast
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
@@ -742,7 +741,7 @@ class ThreadActivity : SimpleActivity() {
             try {
                 startActivityForResult(this, PICK_ATTACHMENT_INTENT)
             } catch (e: ActivityNotFoundException) {
-                toast(R.string.no_app_found)
+                showErrorToast(getString(R.string.no_app_found))
             } catch (e: Exception) {
                 showErrorToast(e)
             }
@@ -847,6 +846,7 @@ class ThreadActivity : SimpleActivity() {
     private fun sendMessage() {
         var msg = thread_type_message.value
         if (msg.isEmpty() && attachmentSelections.isEmpty()) {
+            showErrorToast(getString(R.string.unknown_error_occurred))
             return
         }
 
@@ -880,7 +880,7 @@ class ThreadActivity : SimpleActivity() {
                 } catch (e: Exception) {
                     showErrorToast(e)
                 } catch (e: Error) {
-                    toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
+                    showErrorToast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
                 }
             }
         }
@@ -905,7 +905,7 @@ class ThreadActivity : SimpleActivity() {
         } catch (e: Exception) {
             showErrorToast(e)
         } catch (e: Error) {
-            toast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
+            showErrorToast(e.localizedMessage ?: getString(R.string.unknown_error_occurred))
         }
     }
 
@@ -1009,7 +1009,7 @@ class ThreadActivity : SimpleActivity() {
                 action = Intent.ACTION_VIEW
                 putExtra(CONTACT_ID, contact.rawId)
                 putExtra(IS_PRIVATE, true)
-                `package` = if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug
+                setPackage(if (isPackageInstalled(simpleContacts)) simpleContacts else simpleContactsDebug)
                 setDataAndType(ContactsContract.Contacts.CONTENT_LOOKUP_URI, "vnd.android.cursor.dir/person")
                 launchActivityIntent(this)
             }
@@ -1035,7 +1035,7 @@ class ThreadActivity : SimpleActivity() {
             try {
                 startActivityForResult(this, PICK_SAVE_FILE_INTENT)
             } catch (e: ActivityNotFoundException) {
-                toast(R.string.system_service_disabled, Toast.LENGTH_LONG)
+                showErrorToast(getString(R.string.system_service_disabled))
             } catch (e: Exception) {
                 showErrorToast(e)
             }
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 316e5298..7854987f 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -225,7 +225,7 @@
             android:visibility="gone"
             tools:ignore="HardcodedText" />
 
-        <Button
+        <com.simplemobiletools.commons.views.MyButton
             android:id="@+id/thread_send_message"
             android:layout_width="@dimen/normal_icon_size"
             android:layout_height="@dimen/normal_icon_size"