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 0469dce8..9bb03b4b 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
@@ -20,7 +20,7 @@ public class PostImage {
         this.originalName = originalName;
         this.thumbnailUrl = thumbnailUrl;
         this.imageUrl = imageUrl;
-        this.filename = filename + "." + extension;
+        this.filename = filename;
         this.extension = extension;
         this.imageWidth = imageWidth;
         this.imageHeight = imageHeight;
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 4ff76f3a..aa581689 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
@@ -223,7 +223,7 @@ public class ImageViewerController extends Controller implements View.OnClickLis
     }
 
     public void setTitle(PostImage postImage, int index, int count) {
-        navigationItem.title = postImage.filename;
+        navigationItem.title = postImage.filename + "." + postImage.extension;
         navigationItem.subtitle = (index + 1) + "/" + count;
         navigationItem.updateTitle();
     }