diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
index c3e31788..fb622769 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
@@ -172,7 +172,8 @@ class ThreadAdapter(
             }
 
             if (message.attachment != null) {
-                if (message.attachment.type.startsWith("image/")) {
+                val type = message.attachment.type
+                if (type.startsWith("image/") || type.startsWith("video/")) {
                     val uri = message.attachment.uri
                     val options = RequestOptions()
                         .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -187,7 +188,7 @@ class ThreadAdapter(
                     thread_message_image.setOnClickListener {
                         Intent().apply {
                             action = Intent.ACTION_VIEW
-                            setDataAndType(uri, "image/jpeg")
+                            setDataAndType(uri, type)
                             addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                             activity.startActivity(this)
                         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index 8562dc9b..ffcc3c87 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -18,8 +18,8 @@ import com.simplemobiletools.commons.helpers.isMarshmallowPlus
 import com.simplemobiletools.commons.helpers.isQPlus
 import com.simplemobiletools.smsmessenger.helpers.Config
 import com.simplemobiletools.smsmessenger.models.Contact
-import com.simplemobiletools.smsmessenger.models.MessageAttachment
 import com.simplemobiletools.smsmessenger.models.Message
+import com.simplemobiletools.smsmessenger.models.MessageAttachment
 import java.util.*
 import kotlin.collections.ArrayList
 
@@ -135,7 +135,7 @@ fun Context.getMmsAttachment(id: Int): MessageAttachment? {
         val type = cursor.getStringValue(Mms.Part.CONTENT_TYPE)
         if (type == "text/plain") {
             attachment.text = cursor.getStringValue(Mms.Part.TEXT) ?: ""
-        } else if (type.startsWith("image/")) {
+        } else if (type.startsWith("image/") || type.startsWith("video/")) {
             attachment.uri = Uri.withAppendedPath(uri, partId)
             attachment.type = type
         }