From 8db557003957ca03b1380af8b715fd4b1489ca06 Mon Sep 17 00:00:00 2001
From: Jonathan Putney <jonathan.putney@me.com>
Date: Thu, 26 Apr 2012 16:42:16 -0400
Subject: [PATCH] Updating include/class.mailfetch.php

Correcting the if-statement for message delete and move.
---
 include/class.mailfetch.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 424545c8a..f25d72b26 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -354,10 +354,8 @@ class MailFetcher {
         for($i=$nummsgs; $i>0; $i--){ //process messages in reverse. Latest first. FILO.
             if($this->createTicket($i,$emailid)){
                 imap_setflag_full($this->mbox, imap_uid($this->mbox,$i), "\\Seen", ST_UID); //IMAP only??
-                if($deletemsgs)
+                if((!$archivefolder || !imap_mail_move($this->mbox,$i,$archivefolder)) && $deletemsgs)
                     imap_delete($this->mbox,$i);
-                if(!is_null($archivefolder))
-                    imap_mail_move($this->mbox,$i,$archivefolder);  //May need some error checking for bad folder names
                 $msgs++;
                 $errors=0; //We are only interested in consecutive errors.
             }else{
-- 
GitLab