X-Git-Url: https://code.delx.au/offlineimap/blobdiff_plain/d839be3c61888a837bf2de52939eca9831e68dfc..39a18fef6078388dac7a1db386cdfd2900f5263c:/offlineimap/folder/Base.py

diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
index 8d1bbae..0ee1412 100644
--- a/offlineimap/folder/Base.py
+++ b/offlineimap/folder/Base.py
@@ -14,7 +14,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from threading import *
 from offlineimap import threadutil
@@ -288,10 +288,11 @@ class BaseFolder:
         them to dest."""
         threads = []
         
+	dest_messagelist = dest.getmessagelist()
         for uid in self.getmessagelist().keys():
             if uid < 0:                 # Ignore messages that pass 1 missed.
                 continue
-            if not uid in dest.getmessagelist():
+            if not uid in dest_messagelist:
                 if self.suggeststhreads():
                     self.waitforthread()
                     thread = InstanceLimitedThread(\
@@ -314,10 +315,11 @@ class BaseFolder:
         Look for message present in dest but not in self.
         If any, delete them."""
         deletelist = []
+	self_messagelist = self.getmessagelist()
         for uid in dest.getmessagelist().keys():
             if uid < 0:
                 continue
-            if not uid in self.getmessagelist():
+            if not uid in self_messagelist:
                 deletelist.append(uid)
         if len(deletelist):
             UIBase.getglobalui().deletingmessages(deletelist, applyto)