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 b53bacba..d9028529 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -42,6 +42,7 @@ import com.simplemobiletools.smsmessenger.helpers.*
 import com.simplemobiletools.smsmessenger.models.*
 import com.simplemobiletools.smsmessenger.receivers.SmsSentReceiver
 import kotlinx.android.synthetic.main.activity_thread.*
+import kotlinx.android.synthetic.main.item_attachment.view.*
 import kotlinx.android.synthetic.main.item_selected_contact.view.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -56,7 +57,7 @@ class ThreadActivity : SimpleActivity() {
     private var bus: EventBus? = null
     private var participants = ArrayList<Contact>()
     private var messages = ArrayList<Message>()
-    private var attachmentUris = ArrayList<Uri>()
+    private var attachmentUris = LinkedHashSet<Uri>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -213,10 +214,6 @@ class ThreadActivity : SimpleActivity() {
         thread_add_attachment.setOnClickListener {
             launchPickPhotoVideoIntent()
         }
-
-        thread_remove_attachment.setOnClickListener {
-
-        }
     }
 
     private fun blockNumber() {
@@ -325,7 +322,16 @@ class ThreadActivity : SimpleActivity() {
     }
 
     private fun addAttachment(uri: Uri) {
+        if (attachmentUris.contains(uri)) {
+            return
+        }
+
         attachmentUris.add(uri)
+        thread_attachments_holder.beVisible()
+        val attachmentView = layoutInflater.inflate(R.layout.item_attachment, null).apply {
+            thread_attachments_wrapper.addView(this)
+        }
+
         val roundedCornersRadius = resources.getDimension(R.dimen.medium_margin).toInt()
         val options = RequestOptions()
             .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -337,20 +343,20 @@ class ThreadActivity : SimpleActivity() {
             .apply(options)
             .listener(object : RequestListener<Drawable> {
                 override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
-                    thread_attachment_preview.beGone()
-                    thread_remove_attachment.beGone()
+                    attachmentView.thread_attachment_preview.beGone()
+                    attachmentView.thread_remove_attachment.beGone()
                     showErrorToast(e?.localizedMessage ?: "")
                     return false
                 }
 
                 override fun onResourceReady(dr: Drawable?, a: Any?, t: Target<Drawable>?, d: DataSource?, i: Boolean): Boolean {
-                    thread_attachment_preview.beVisible()
-                    thread_remove_attachment.beVisible()
+                    attachmentView.thread_attachment_preview.beVisible()
+                    attachmentView.thread_remove_attachment.beVisible()
                     checkSendMessageAvailability()
                     return false
                 }
             })
-            .into(thread_attachment_preview)
+            .into(attachmentView.thread_attachment_preview)
     }
 
     private fun checkSendMessageAvailability() {
diff --git a/app/src/main/res/layout/activity_thread.xml b/app/src/main/res/layout/activity_thread.xml
index 1f6a78a7..9aabd74d 100644
--- a/app/src/main/res/layout/activity_thread.xml
+++ b/app/src/main/res/layout/activity_thread.xml
@@ -95,7 +95,7 @@
         android:id="@+id/message_divider"
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:layout_above="@+id/thread_attachment_preview"
+        android:layout_above="@+id/thread_attachments_holder"
         android:background="@color/divider_grey"
         android:importantForAccessibility="no" />
 
@@ -112,25 +112,27 @@
         android:padding="@dimen/normal_margin"
         android:src="@drawable/ic_plus_vector" />
 
-    <ImageView
-        android:id="@+id/thread_attachment_preview"
-        android:layout_width="@dimen/attachment_preview_size"
-        android:layout_height="@dimen/attachment_preview_size"
+    <HorizontalScrollView
+        android:id="@+id/thread_attachments_holder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/thread_type_message"
         android:layout_alignStart="@+id/thread_type_message"
         android:layout_marginTop="@dimen/normal_margin"
         android:layout_marginBottom="@dimen/small_margin"
-        android:visibility="gone" />
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        android:visibility="gone">
 
-    <ImageView
-        android:id="@+id/thread_remove_attachment"
-        android:layout_width="@dimen/remove_attachment_size"
-        android:layout_height="@dimen/remove_attachment_size"
-        android:layout_alignTop="@+id/thread_attachment_preview"
-        android:layout_alignEnd="@+id/thread_attachment_preview"
-        android:padding="@dimen/tiny_margin"
-        android:src="@drawable/ic_cross_vector"
-        android:visibility="gone" />
+        <LinearLayout
+            android:id="@+id/thread_attachments_wrapper"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/attachment_preview_size"
+            android:divider="@drawable/linear_layout_horizontal_divider"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/normal_margin"
+            android:showDividers="middle" />
+    </HorizontalScrollView>
 
     <com.simplemobiletools.commons.views.MyEditText
         android:id="@+id/thread_type_message"
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
new file mode 100644
index 00000000..ee25d173
--- /dev/null
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/conversation_holder"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/thread_attachment_preview"
+        android:layout_width="@dimen/attachment_preview_size"
+        android:layout_height="@dimen/attachment_preview_size"
+        android:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/thread_remove_attachment"
+        android:layout_width="@dimen/remove_attachment_size"
+        android:layout_height="@dimen/remove_attachment_size"
+        android:layout_alignTop="@+id/thread_attachment_preview"
+        android:layout_alignEnd="@+id/thread_attachment_preview"
+        android:padding="@dimen/tiny_margin"
+        android:src="@drawable/ic_cross_vector"
+        android:visibility="gone" />
+
+</RelativeLayout>