diff --git a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
index e5ebc24..e7fae56 100644
--- a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
+++ b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
@@ -48,6 +48,10 @@ class CircularLetterAdapter(private val circulars: List<Circular>) :
         var favouriteButton: ImageButton = view.circular_favourite_button
         var reminderButton: ImageButton = view.circular_reminder_button
         var attachmentsList: RecyclerView = view.circulars_attachments_list
+
+        init {
+            attachmentsList.layoutManager = LinearLayoutManager(context)
+        }
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CircularLetterViewHolder {
@@ -82,7 +86,6 @@ class CircularLetterAdapter(private val circulars: List<Circular>) :
 
         if (circulars[position].attachmentsNames.isNotEmpty()) {
             holder.attachmentsList.visibility = View.VISIBLE
-            holder.attachmentsList.layoutManager = LinearLayoutManager(context)
             holder.attachmentsList.adapter = AttachmentAdapter(
                 circulars[position].attachmentsNames,
                 circulars[position].attachmentsUrls
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index 243ffd8..82a2f72 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/linearLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <View
         android:id="@+id/attachment_divider"