diff --git a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
index e8c66a489f..c4f798db65 100644
--- a/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
+++ b/app/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
@@ -3270,15 +3270,8 @@ public class IMAPProtocol extends Protocol {
 	boolean done = false;		// done reading responses?
 	notifyResponseHandlers(responses);
 
-    if (r.isUnTagged() && r.isOK()) // Still here
-        try {
-            DataOutputStream output = (DataOutputStream) getOutputStream();
-            output.writeBytes("DONE");
-            output.write(CRLF);
-            output.flush();
-        } catch (IOException ex) {
-            throw new ProtocolException("IDLE/DONE", ex);
-        }
+	if (r.isUnTagged() && r.isOK()) // Still here
+		idleAbort();
 
 	if (r.isBYE()) // shouldn't wait for command completion response
 	    done = true;