diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
index 36d29dc3..7107d437 100644
--- a/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
+++ b/app/src/main/java/xyz/quaver/pupil/adapters/ReaderAdapter.kt
@@ -21,12 +21,16 @@ package xyz.quaver.pupil.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import kotlinx.android.synthetic.main.item_reader.view.*
+import kotlinx.coroutines.runBlocking
+import xyz.quaver.hitomi.Reader
 import xyz.quaver.pupil.BuildConfig
 import xyz.quaver.pupil.R
+import xyz.quaver.pupil.util.GalleryDownloader
 import xyz.quaver.pupil.util.getCachedGallery
 import java.io.File
 
@@ -47,24 +51,39 @@ class ReaderAdapter(private val glide: RequestManager,
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.view as ImageView
+        holder.view as ConstraintLayout
 
         if (isFullScreen)
             holder.view.layoutParams.height = RecyclerView.LayoutParams.MATCH_PARENT
         else
             holder.view.layoutParams.height = RecyclerView.LayoutParams.WRAP_CONTENT
 
+        var reader: Reader? = null
+        with (GalleryDownloader[galleryID]?.reader) {
+            if (this?.isCompleted == true)
+                runBlocking {
+                    reader = await()
+                }
+        }
+
         glide
             .load(File(getCachedGallery(holder.view.context, galleryID), images[position]))
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .skipMemoryCache(true)
             .error(R.drawable.image_broken_variant)
-            .dontTransform()
             .apply {
                 if (BuildConfig.CENSOR)
                     override(5, 8)
+                else {
+                    val galleryInfo = reader?.galleryInfo?.get(position)
+
+                    if (galleryInfo != null) {
+                        (holder.view.image.layoutParams as ConstraintLayout.LayoutParams)
+                            .dimensionRatio = "${galleryInfo.width}:${galleryInfo.height}"
+                    }
+                }
             }
-            .into(holder.view)
+            .into(holder.view.image)
     }
 
     override fun getItemCount() = images.size
diff --git a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
index 660bb913..c440000f 100644
--- a/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/util/GalleryDownloader.kt
@@ -84,7 +84,7 @@ class GalleryDownloader(
             onNotifyChangedHandler?.invoke(value)
         }
 
-    private val reader: Deferred<Reader?>?
+    val reader: Deferred<Reader?>?
     private var downloadJob: Job? = null
 
     private lateinit var notificationBuilder: NotificationCompat.Builder
diff --git a/app/src/main/res/layout/item_reader.xml b/app/src/main/res/layout/item_reader.xml
index 4a9ceffd..4b971651 100644
--- a/app/src/main/res/layout/item_reader.xml
+++ b/app/src/main/res/layout/item_reader.xml
@@ -17,9 +17,21 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<com.github.chrisbanes.photoview.PhotoView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentDescription="@string/reader_imageview_description"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="100dp"
-    android:paddingBottom="8dp"/>
\ No newline at end of file
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/image"
+        android:contentDescription="@string/reader_imageview_description"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:paddingBottom="8dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file