diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java b/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
index 9e4ba969..9cddb91f 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/PostImage.java
@@ -16,7 +16,7 @@ public class PostImage {
     public PostImage(String thumbnailUrl, String imageUrl, String filename, String extension, int imageWidth, int imageHeight) {
         this.thumbnailUrl = thumbnailUrl;
         this.imageUrl = imageUrl;
-        this.filename = filename;
+        this.filename = filename + "." + extension;
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
 
diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
index 405a820e..39a2166f 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
@@ -46,6 +46,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
     public void onViewMeasured() {
         // Pager is measured, but still invisible
         callback.startPreviewInTransition();
+        callback.setTitle(images.get(selectedPosition));
     }
 
     public void onInTransitionEnd() {
@@ -117,6 +118,8 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
     }
 
     private void onPageSwipedTo(int position) {
+        callback.setTitle(images.get(selectedPosition));
+
         for (PostImage other : getOther(position, false)) {
             callback.setImageMode(other, MultiImageView.Mode.LOWRES);
         }
@@ -195,6 +198,8 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
 
         public void setImageMode(PostImage postImage, MultiImageView.Mode mode);
 
+        public void setTitle(PostImage postImage);
+
         public MultiImageView.Mode getImageMode(PostImage postImage);
     }
 }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
index 7de137f5..354c8814 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ImageViewerController.java
@@ -60,8 +60,6 @@ public class ImageViewerController extends Controller implements View.OnClickLis
     public void onCreate() {
         super.onCreate();
 
-        navigationItem.title = "Image title here";
-
         view = inflateRes(R.layout.controller_image_viewer);
         view.setOnClickListener(this);
         previewImage = (ClippingImageView) view.findViewById(R.id.preview_image);
@@ -119,6 +117,11 @@ public class ImageViewerController extends Controller implements View.OnClickLis
         return ((ImageViewerAdapter) pager.getAdapter()).getMode(postImage);
     }
 
+    public void setTitle(PostImage postImage) {
+        navigationItem.title = postImage.filename;
+        toolbar.setNavigationItem(false, false, navigationItem);
+    }
+
     public void startPreviewInTransition() {
         ImageView previewImageView = previewCallback.getPreviewImageStartView(this);
         previewImage.setImageDrawable(previewImageView.getDrawable());