fix faulty logic

2 files changed, 6 insertions, 4 deletions

diff --git a/src/dbmail-imapsession.c b/src/dbmail-imapsession.c
index 8bd99f96..423d4533 100644
--- a/src/dbmail-imapsession.c
+++ b/src/dbmail-imapsession.c
@@ -925,9 +925,12 @@ static int _fetch_get_items(ImapSession *self, u64_t *uid)
 		g_free(s);
 	}
 	if (self->fi->getSize) {
+		u64_t rfcsize = msginfo->rfcsize;
 		SEND_SPACE;
-		dbmail_imap_session_buff_printf(self, "RFC822.SIZE %llu", 
-				self->cache?Cache_get_size(self->cache):msginfo->rfcsize);
+
+		if (self->fi->msgparse_needed && self->cache)
+			rfcsize = Cache_get_size(self->cache);
+		dbmail_imap_session_buff_printf(self, "RFC822.SIZE %llu", rfcsize);
 	}
 	if (self->fi->getFlags) {
 		SEND_SPACE;
diff --git a/test-scripts/testimap.py b/test-scripts/testimap.py
index fb179999..2d61898f 100755
--- a/test-scripts/testimap.py
+++ b/test-scripts/testimap.py
@@ -30,10 +30,9 @@ TYPE = 'network'
 
 
 import unittest, imaplib, re, commands
-import sys, traceback, getopt, string
+import traceback, string
 from email.MIMEText import MIMEText
 from email.MIMEMultipart import MIMEMultipart
-import email
 import time
 
 unimplementedError = 'Dbmail testcase unimplemented'