From 77030633fed889c56aaa8a3c0fb43a7a0dc40b16 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 22 Nov 2018 18:47:12 +0100
Subject: [PATCH] Revert "Revert "Refactoring""

This reverts commit 4c4689a8402de5b8830f273d1c3fa960f1f4f815.
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 56a5b9a710..a23eb4cacf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -611,6 +611,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                     db.message().setMessageUiIgnored(message.id, true);
                                     EntityOperation.queue(db, message, EntityOperation.SEEN, seen);
                                 }
+
                                 db.setTransactionSuccessful();
                             } finally {
                                 db.endTransaction();
@@ -1008,8 +1009,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                         db.message().setMessageUiHide(id, true);
 
                                         EntityMessage message = db.message().getMessage(id);
-                                        EntityFolder spam = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
-                                        EntityOperation.queue(db, message, EntityOperation.MOVE, spam.id);
+                                        EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
+                                        EntityOperation.queue(db, message, EntityOperation.MOVE, junk.id);
 
                                         db.setTransactionSuccessful();
                                     } finally {