diff --git a/app/src/main/java/org/dystopia/email/AdapterMessage.java b/app/src/main/java/org/dystopia/email/AdapterMessage.java
index e446ac5d..8ac2a78c 100644
--- a/app/src/main/java/org/dystopia/email/AdapterMessage.java
+++ b/app/src/main/java/org/dystopia/email/AdapterMessage.java
@@ -552,7 +552,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         }
 
         private void onShowImages(EntityMessage message) {
-            properties.setImages(message.id, !properties.showImages(message.id));
+            properties.setImages(message.id, true);
+            btnImages.setEnabled(false);
 
             Bundle args = new Bundle();
             args.putSerializable("message", message);
diff --git a/app/src/main/java/org/dystopia/email/FragmentEx.java b/app/src/main/java/org/dystopia/email/FragmentEx.java
index 3c8597a4..831de48a 100644
--- a/app/src/main/java/org/dystopia/email/FragmentEx.java
+++ b/app/src/main/java/org/dystopia/email/FragmentEx.java
@@ -17,6 +17,7 @@ package org.dystopia.email;
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
     Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2019 by Distopico <distopico@riseup.net>
 */
 
 import android.content.res.Configuration;
diff --git a/app/src/main/java/org/dystopia/email/FragmentOptions.java b/app/src/main/java/org/dystopia/email/FragmentOptions.java
index 1855a702..5007cc37 100644
--- a/app/src/main/java/org/dystopia/email/FragmentOptions.java
+++ b/app/src/main/java/org/dystopia/email/FragmentOptions.java
@@ -17,6 +17,7 @@ package org.dystopia.email;
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
     Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2019 by Distopico <distopico@riseup.net>
 */
 
 import android.content.SharedPreferences;