*** download_emails.php 2014-03-03 10:34:44.000000000 -0500
--- download_emails.php 2015-07-29 14:14:11.000000000 -0400
***************
*** 232,243 ****
      );
  }

! $total_emails = Support::getTotalEmails($mbox);

! if ($total_emails > 0) {
!     for ($i = 1; $i <= $total_emails; $i++) {
!         Support::getEmailInfo($mbox, $account, $i);
      }
  }
! imap_expunge($mbox);
  Support::clearErrors();
--- 232,253 ----
      );
  }

! // if we only want new emails
! if ($account['ema_get_only_new']) {
!     $new_emails = Support::getNewEmails($mbox);

!     foreach ($new_emails as $new_email) {
!         Support::getEmailInfo($mbox, $account, $new_email);
!     }
! } else {
!     $total_emails = Support::getTotalEmails($mbox);
!
!     if ($total_emails > 0) {
!         for ($i = 1; $i <= $total_emails; $i++) {
!             Support::getEmailInfo($mbox, $account, $i);
!         }
      }
  }
!
! Support::closeEmailServer($mbox);
  Support::clearErrors();