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 14760758..a294afd8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
@@ -283,7 +283,15 @@ class ThreadAdapter(
 
                         builder.into(imageView.attachment_image)
                         imageView.attachment_image.setOnClickListener {
-                            launchViewIntent(uri, mimetype, attachment.filename)
+                            if (actModeCallback.isSelectable) {
+                                holder.viewClicked(message)
+                            } else {
+                                launchViewIntent(uri, mimetype, attachment.filename)
+                            }
+                        }
+                        imageView.setOnLongClickListener {
+                            holder.viewLongClicked()
+                            true
                         }
                     } else {
                         if (message.isReceivedMessage()) {
@@ -294,7 +302,15 @@ class ThreadAdapter(
                                     }
                                     setTextColor(textColor)
                                     setOnClickListener {
-                                        launchViewIntent(uri, mimetype, attachment.filename)
+                                        if (actModeCallback.isSelectable) {
+                                            holder.viewClicked(message)
+                                        } else {
+                                            launchViewIntent(uri, mimetype, attachment.filename)
+                                        }
+                                    }
+                                    setOnLongClickListener {
+                                        holder.viewLongClicked()
+                                        true
                                     }
                                 }
                             }
@@ -309,7 +325,15 @@ class ThreadAdapter(
                                         thread_sent_attachment_label.text = attachment.filename
                                     }
                                     setOnClickListener {
-                                        launchViewIntent(uri, mimetype, attachment.filename)
+                                        if (actModeCallback.isSelectable) {
+                                            holder.viewClicked(message)
+                                        } else {
+                                            launchViewIntent(uri, mimetype, attachment.filename)
+                                        }
+                                    }
+                                    setOnLongClickListener {
+                                        holder.viewLongClicked()
+                                        true
                                     }
                                 }
                             }