diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java
index 068cc81a0..82172bf6e 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/ImapSessionFolder.java
@@ -186,11 +186,6 @@ public boolean isSelectable() {
         return folder.isSelectable();
     }
 
-    @Override
-    public long getUidNext() { // TODO: Remove in 1.7
-        return getUIDNext();
-    }
-
     @Override
     public int getUnseenCount() {
         return folder.getUnseenCount();
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SelectCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SelectCommand.java
index c5b032e68..d777f4861 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SelectCommand.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/SelectCommand.java
@@ -52,7 +52,7 @@ protected void doProcess(ImapRequestLineReader request,
         final boolean resetRecent = !isExamine;
         response.recentResponse(mailbox.getRecentCount(resetRecent));
         response.okResponse("UIDVALIDITY " + mailbox.getUidValidity(), null);
-        response.okResponse("UIDNEXT " + mailbox.getUidNext(), null);
+        response.okResponse("UIDNEXT " + mailbox.getUIDNext(), null);
 
         int firstUnseen = mailbox.getFirstUnseen();
         if (firstUnseen > 0) {
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StatusCommand.java b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StatusCommand.java
index e5c47eadc..42e2dc8d7 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StatusCommand.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/imap/commands/StatusCommand.java
@@ -78,7 +78,7 @@ protected void doProcess(ImapRequestLineReader request,
         if (statusDataItems.uidNext) {
             buffer.append(UIDNEXT);
             buffer.append(SP);
-            buffer.append(folder.getUidNext());
+            buffer.append(folder.getUIDNext());
             buffer.append(SP);
         }
 
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java
index d66444be9..b4d674c20 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/HierarchicalFolder.java
@@ -133,11 +133,6 @@ public long getUidValidity() {
         return uidValidity;
     }
 
-    @Override
-    public long getUidNext() { // TODO: Remove in 1.7
-        return getUIDNext();
-    }
-
     @Override
     public long getUIDNext() {
         return nextUid.get();
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java
index e67667017..7d960b0ea 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/MailFolder.java
@@ -45,14 +45,6 @@ public interface MailFolder {
 
     boolean isSelectable();
 
-    /**
-     * @deprecated Use #getUIDNext()
-     *
-     * Deprecated in 1.6, to be removed in 1.7 (TODO)
-     */
-    @Deprecated
-    long getUidNext();
-
     /**
      * {@inheritDoc}
      */