15 files changed, 245 insertions, 241 deletions

diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h
index f4f6e7ef..85bfd69f 100644
--- a/src/core/imap/MCIMAPFolder.h
+++ b/src/core/imap/MCIMAPFolder.h
@@ -8,33 +8,33 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-	
-	class IMAPFolder : public Object {
-	public:
-		IMAPFolder();
-		virtual ~IMAPFolder();
-		
-		virtual void setPath(String * path);
-		virtual String * path();
-		
-		virtual void setDelimiter(char delimiter);
-		virtual char delimiter();
-		
-		virtual void setFlags(IMAPFolderFlag flags);
-		virtual IMAPFolderFlag flags();
+    
+    class IMAPFolder : public Object {
+    public:
+        IMAPFolder();
+        virtual ~IMAPFolder();
+        
+        virtual void setPath(String * path);
+        virtual String * path();
+        
+        virtual void setDelimiter(char delimiter);
+        virtual char delimiter();
+        
+        virtual void setFlags(IMAPFolderFlag flags);
+        virtual IMAPFolderFlag flags();
         
     public: // subclass behavior
-		IMAPFolder(IMAPFolder * other);
-		virtual Object * copy();
-		virtual String * description();
+        IMAPFolder(IMAPFolder * other);
+        virtual Object * copy();
+        virtual String * description();
         
-	private:
-		String * mPath;
-		char mDelimiter;
-		IMAPFolderFlag mFlags;
-		void init();
-	};
-	
+    private:
+        String * mPath;
+        char mDelimiter;
+        IMAPFolderFlag mFlags;
+        void init();
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h
index 5a6dbac2..a4c9ede9 100644
--- a/src/core/imap/MCIMAPFolderStatus.h
+++ b/src/core/imap/MCIMAPFolderStatus.h
@@ -16,47 +16,46 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-	
-	class IMAPFolderStatus : public Object {
-	public:
-
-		IMAPFolderStatus();
-		virtual ~IMAPFolderStatus();
-
-		virtual void setUnseenCount(uint32_t unseen);
-		virtual uint32_t unseenCount();
-
-		virtual void setMessageCount(uint32_t messages);
-		virtual uint32_t messageCount();
-
-		virtual void setRecentCount(uint32_t recent);
-		virtual uint32_t recentCount();
-
-		virtual void setUidNext(uint32_t uidNext);
-		virtual uint32_t uidNext();
-
-		virtual void setUidValidity(uint32_t uidValidity);
-		virtual uint32_t uidValidity();
+    
+    class IMAPFolderStatus : public Object {
+    public:
+        IMAPFolderStatus();
+        virtual ~IMAPFolderStatus();
+        
+        virtual void setUnseenCount(uint32_t unseen);
+        virtual uint32_t unseenCount();
+        
+        virtual void setMessageCount(uint32_t messages);
+        virtual uint32_t messageCount();
+        
+        virtual void setRecentCount(uint32_t recent);
+        virtual uint32_t recentCount();
+        
+        virtual void setUidNext(uint32_t uidNext);
+        virtual uint32_t uidNext();
+        
+        virtual void setUidValidity(uint32_t uidValidity);
+        virtual uint32_t uidValidity();
         
         virtual void setHighestModSeqValue(uint64_t highestModSeqValue);
         virtual uint64_t highestModSeqValue();
-
+        
     public: // subclass behavior
-		IMAPFolderStatus(IMAPFolderStatus * other);
-		virtual Object * copy();		
-		virtual String * description();
-
-	private:
-		uint32_t mUnseenCount;
-		uint32_t mMessageCount;
-		uint32_t mRecentCount;
-		uint32_t mUidNext;
-		uint32_t mUidValidity;
+        IMAPFolderStatus(IMAPFolderStatus * other);
+        virtual Object * copy();		
+        virtual String * description();
+        
+    private:
+        uint32_t mUnseenCount;
+        uint32_t mMessageCount;
+        uint32_t mRecentCount;
+        uint32_t mUidNext;
+        uint32_t mUidValidity;
         uint64_t mHighestModSeqValue;
-
-		void init();
-	};
-	
+        
+        void init();
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h
index c2565955..83bd3273 100644
--- a/src/core/imap/MCIMAPIdentity.h
+++ b/src/core/imap/MCIMAPIdentity.h
@@ -15,37 +15,37 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-	
-	class IMAPIdentity : public Object {
-	public:
+    
+    class IMAPIdentity : public Object {
+    public:
         
-		IMAPIdentity();
-		virtual ~IMAPIdentity();
+        IMAPIdentity();
+        virtual ~IMAPIdentity();
         
-		virtual void setVendor(String * vendor);
-		virtual String * vendor();
+        virtual void setVendor(String * vendor);
+        virtual String * vendor();
         
-		virtual void setName(String * name);
-		virtual String * name();
+        virtual void setName(String * name);
+        virtual String * name();
         
-		virtual void setVersion(String * version);
-		virtual String * version();
+        virtual void setVersion(String * version);
+        virtual String * version();
         
         virtual Array * allInfoKeys();
         virtual String * infoForKey(String * key);
         virtual void setInfoForKey(String * key, String * value);
         
     public: // subclass behavior
-		IMAPIdentity(IMAPIdentity * identity);
-		virtual Object * copy();
-		virtual String * description();
+        IMAPIdentity(IMAPIdentity * identity);
+        virtual Object * copy();
+        virtual String * description();
         
-	private:
+    private:
         HashMap * mValues;
         
-		void init();
-	};
-	
+        void init();
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index d01d23a1..ebcad889 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -25,7 +25,7 @@ namespace mailcore {
         
         virtual uint32_t size();
         virtual void setSize(uint32_t size);
-
+        
         virtual void setFlags(MessageFlag flags);
         virtual MessageFlag flags();
         
@@ -43,7 +43,7 @@ namespace mailcore {
         
         virtual void setGmailMessageID(uint64_t msgID);
         virtual uint64_t gmailMessageID();
-        		
+                
         virtual void setGmailThreadID(uint64_t threadID);
         virtual uint64_t gmailThreadID();
         
@@ -67,7 +67,7 @@ namespace mailcore {
         uint64_t mModSeqValue;
         uint32_t mUid;
         uint32_t mSize;
-
+        
         MessageFlag mFlags;
         MessageFlag mOriginalFlags;
         AbstractPart * mMainPart;
diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h
index 3afb2b98..a355ed8f 100644
--- a/src/core/imap/MCIMAPMessagePart.h
+++ b/src/core/imap/MCIMAPMessagePart.h
@@ -26,6 +26,7 @@ namespace mailcore {
         String * mPartID;
         void init();
     };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h
index ca3574ab..9d03bd78 100644
--- a/src/core/imap/MCIMAPMultipart.h
+++ b/src/core/imap/MCIMAPMultipart.h
@@ -26,6 +26,7 @@ namespace mailcore {
         String * mPartID;
         void init();
     };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h
index 4ce0b546..bcb4b185 100644
--- a/src/core/imap/MCIMAPNamespace.h
+++ b/src/core/imap/MCIMAPNamespace.h
@@ -7,43 +7,43 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
-	class IMAPNamespaceItem;
-
-	class IMAPNamespace : public Object {
-	public:
-		IMAPNamespace();
-		virtual ~IMAPNamespace();
-		
-		virtual String * mainPrefix();
-		virtual char mainDelimiter();
-
-		virtual Array * /* String */ prefixes();
-
-		virtual String * pathForComponents(Array * components);
-		virtual String * pathForComponentsAndPrefix(Array * components, String * prefix);
-
-		virtual Array * /* String */ componentsFromPath(String * path);
-
-		virtual bool containsFolderPath(String * path);
-
-		static IMAPNamespace * namespaceWithPrefix(String * prefix, char delimiter);
+    
+    class IMAPNamespaceItem;
+    
+    class IMAPNamespace : public Object {
+    public:
+        IMAPNamespace();
+        virtual ~IMAPNamespace();
+        
+        virtual String * mainPrefix();
+        virtual char mainDelimiter();
+        
+        virtual Array * /* String */ prefixes();
+        
+        virtual String * pathForComponents(Array * components);
+        virtual String * pathForComponentsAndPrefix(Array * components, String * prefix);
+        
+        virtual Array * /* String */ componentsFromPath(String * path);
+        
+        virtual bool containsFolderPath(String * path);
+        
+        static IMAPNamespace * namespaceWithPrefix(String * prefix, char delimiter);
         
     public: // subclass behavior
-		IMAPNamespace(IMAPNamespace * other);
-		virtual String * description();
-		virtual Object * copy();
+        IMAPNamespace(IMAPNamespace * other);
+        virtual String * description();
+        virtual Object * copy();
         
-	private:
-		Array * /* String */ mItems;
-		void init();
-		IMAPNamespaceItem * mainItem();
-		IMAPNamespaceItem * itemForPath(String * path);
+    private:
+        Array * /* String */ mItems;
+        void init();
+        IMAPNamespaceItem * mainItem();
+        IMAPNamespaceItem * itemForPath(String * path);
         
     public: // private
-		virtual void importIMAPNamespace(struct mailimap_namespace_item * item);
-	};
-
+        virtual void importIMAPNamespace(struct mailimap_namespace_item * item);
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h
index 8ab094cc..a4cc605b 100644
--- a/src/core/imap/MCIMAPNamespaceItem.h
+++ b/src/core/imap/MCIMAPNamespaceItem.h
@@ -7,38 +7,38 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
-	class IMAPNamespaceItem : public Object {
-	public:
-		IMAPNamespaceItem();
-		virtual ~IMAPNamespaceItem();
-		
-		virtual void setPrefix(String * prefix);
-		virtual String * prefix();
-		
-		virtual void setDelimiter(char delimiter);
-		virtual char delimiter();
-
-		virtual String * pathForComponents(Array * components);
-		virtual Array * /* String */ componentsForPath(String * path);
-
-		virtual bool containsFolder(String * folder);
+    
+    class IMAPNamespaceItem : public Object {
+    public:
+        IMAPNamespaceItem();
+        virtual ~IMAPNamespaceItem();
+        
+        virtual void setPrefix(String * prefix);
+        virtual String * prefix();
+        
+        virtual void setDelimiter(char delimiter);
+        virtual char delimiter();
+        
+        virtual String * pathForComponents(Array * components);
+        virtual Array * /* String */ componentsForPath(String * path);
+        
+        virtual bool containsFolder(String * folder);
         
     public: // subclass behavior
-		IMAPNamespaceItem(IMAPNamespaceItem * other);
-		virtual String * description();
-		virtual Object * copy();
+        IMAPNamespaceItem(IMAPNamespaceItem * other);
+        virtual String * description();
+        virtual Object * copy();
         
-	private:
-	    char mDelimiter;
-	    String * mPrefix;
-		void init();
+    private:
+        char mDelimiter;
+        String * mPrefix;
+        void init();
         
     public: // private
-		virtual void importIMAPNamespaceInfo(struct mailimap_namespace_info * info);
+        virtual void importIMAPNamespaceInfo(struct mailimap_namespace_info * info);
+    
+    };
     
-	};
-
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPPart.cc b/src/core/imap/MCIMAPPart.cc
index 5fc39fc9..c75891a7 100644
--- a/src/core/imap/MCIMAPPart.cc
+++ b/src/core/imap/MCIMAPPart.cc
@@ -12,7 +12,7 @@ using namespace mailcore;
 void IMAPPart::init()
 {
     mPartID = NULL;
-	mEncoding = Encoding8Bit;
+    mEncoding = Encoding8Bit;
     mSize = 0;
 }
 
@@ -25,7 +25,7 @@ IMAPPart::IMAPPart(IMAPPart * other) : AbstractPart(other)
 {
     init();
     MC_SAFE_REPLACE_COPY(String, mPartID, other->mPartID);
-	mEncoding = other->mEncoding;
+    mEncoding = other->mEncoding;
     mSize = other->mSize;
 }
 
@@ -71,13 +71,13 @@ Encoding IMAPPart::encoding()
 
 unsigned int IMAPPart::decodedSize()
 {
-	switch (mEncoding) {
-		case MAILIMAP_BODY_FLD_ENC_BASE64:
+    switch (mEncoding) {
+        case MAILIMAP_BODY_FLD_ENC_BASE64:
             return mSize * 3 / 4;
             
         default:
             return mSize;
-	}
+    }
 }
 
 AbstractPart * IMAPPart::attachmentWithIMAPBody(struct mailimap_body * body)
@@ -86,7 +86,7 @@ AbstractPart * IMAPPart::attachmentWithIMAPBody(struct mailimap_body * body)
     AbstractPart * result;
     
     partID = NULL;
-	if (body->bd_type == MAILIMAP_BODY_1PART) {
+    if (body->bd_type == MAILIMAP_BODY_1PART) {
         partID = MCSTR("1");
     }
     result = attachmentWithIMAPBodyInternal(body, partID);
@@ -97,55 +97,55 @@ AbstractPart * IMAPPart::attachmentWithIMAPBody(struct mailimap_body * body)
 
 AbstractPart * IMAPPart::attachmentWithIMAPBodyInternal(struct mailimap_body * body, String * partID)
 {
-	switch (body->bd_type) {
-		case MAILIMAP_BODY_1PART:
+    switch (body->bd_type) {
+        case MAILIMAP_BODY_1PART:
         return attachmentWithIMAPBody1Part(body->bd_data.bd_body_1part, partID);
-		case MAILIMAP_BODY_MPART:
+        case MAILIMAP_BODY_MPART:
         return attachmentWithIMAPBodyMultipart(body->bd_data.bd_body_mpart, partID);
-	}
-	
+    }
+    
     return NULL;
 }
 
 AbstractPart * IMAPPart::attachmentWithIMAPBody1Part(struct mailimap_body_type_1part * body_1part,
     String * partID)
 {
-	switch (body_1part->bd_type) {
-		case MAILIMAP_BODY_TYPE_1PART_BASIC:
-		{
-			IMAPPart * attachment;
+    switch (body_1part->bd_type) {
+        case MAILIMAP_BODY_TYPE_1PART_BASIC:
+        {
+            IMAPPart * attachment;
             
-			attachment = attachmentWithIMAPBody1PartBasic(body_1part->bd_data.bd_type_basic,
+            attachment = attachmentWithIMAPBody1PartBasic(body_1part->bd_data.bd_type_basic,
                 body_1part->bd_ext_1part);
             attachment->setPartID(partID);
             return attachment;
-		}
-		case MAILIMAP_BODY_TYPE_1PART_MSG:
-		{
-			return attachmentWithIMAPBody1PartMessage(body_1part->bd_data.bd_type_msg,
+        }
+        case MAILIMAP_BODY_TYPE_1PART_MSG:
+        {
+            return attachmentWithIMAPBody1PartMessage(body_1part->bd_data.bd_type_msg,
                 body_1part->bd_ext_1part, partID);
-		}
-		case MAILIMAP_BODY_TYPE_1PART_TEXT:
-		{
-			IMAPPart * attachment;
-			
-			attachment = attachmentWithIMAPBody1PartText(body_1part->bd_data.bd_type_text,
+        }
+        case MAILIMAP_BODY_TYPE_1PART_TEXT:
+        {
+            IMAPPart * attachment;
+            
+            attachment = attachmentWithIMAPBody1PartText(body_1part->bd_data.bd_type_text,
                 body_1part->bd_ext_1part);
             attachment->setPartID(partID);
             MCLog("attachment %s", MCUTF8(partID));
             return attachment;
-		}
-	}
-	
-	return NULL;
+        }
+    }
+    
+    return NULL;
 }
 
 IMAPMessagePart * IMAPPart::attachmentWithIMAPBody1PartMessage(struct mailimap_body_type_msg * message,
     struct mailimap_body_ext_1part * extension,
     String * partID)
 {
-	IMAPMessagePart * attachment;
-	AbstractPart * subAttachment;
+    IMAPMessagePart * attachment;
+    AbstractPart * subAttachment;
     String * nextPartID;
     
     nextPartID = NULL;
@@ -157,7 +157,7 @@ IMAPMessagePart * IMAPPart::attachmentWithIMAPBody1PartMessage(struct mailimap_b
         // mpart
         nextPartID = partID;
     }
-	
+    
     attachment = new IMAPMessagePart();
     attachment->setPartID(partID);
     attachment->header()->importIMAPEnvelope(message->bd_envelope);
@@ -197,47 +197,47 @@ void IMAPPart::importIMAPFields(struct mailimap_body_fields * fields,
 IMAPPart * IMAPPart::attachmentWithIMAPBody1PartBasic(struct mailimap_body_type_basic * basic,
     struct mailimap_body_ext_1part * extension)
 {
-	IMAPPart * attachment;
-	String * mimeType;
-	
-	attachment = new IMAPPart();
+    IMAPPart * attachment;
+    String * mimeType;
+    
+    attachment = new IMAPPart();
     attachment->importIMAPFields(basic->bd_fields, extension);
     
     mimeType = NULL;
-	switch (basic->bd_media_basic->med_type) {
-		case MAILIMAP_MEDIA_BASIC_APPLICATION:
+    switch (basic->bd_media_basic->med_type) {
+        case MAILIMAP_MEDIA_BASIC_APPLICATION:
         mimeType = String::stringWithUTF8Format("application/%s", basic->bd_media_basic->med_subtype);
         break;
-		case MAILIMAP_MEDIA_BASIC_AUDIO:
+        case MAILIMAP_MEDIA_BASIC_AUDIO:
         mimeType = String::stringWithUTF8Format("audio/%s", basic->bd_media_basic->med_subtype);
         break;
-		case MAILIMAP_MEDIA_BASIC_IMAGE:
+        case MAILIMAP_MEDIA_BASIC_IMAGE:
         mimeType = String::stringWithUTF8Format("image/%s", basic->bd_media_basic->med_subtype);
         break;
-		case MAILIMAP_MEDIA_BASIC_MESSAGE:
+        case MAILIMAP_MEDIA_BASIC_MESSAGE:
         mimeType = String::stringWithUTF8Format("message/%s", basic->bd_media_basic->med_subtype);
         break;
-		case MAILIMAP_MEDIA_BASIC_VIDEO:
+        case MAILIMAP_MEDIA_BASIC_VIDEO:
         mimeType = String::stringWithUTF8Format("video/%s", basic->bd_media_basic->med_subtype);
         break;
-		case MAILIMAP_MEDIA_BASIC_OTHER:
+        case MAILIMAP_MEDIA_BASIC_OTHER:
         mimeType = String::stringWithUTF8Format("%s/%s", basic->bd_media_basic->med_basic_type, basic->bd_media_basic->med_subtype);
         break;
-	}
+    }
     attachment->setMimeType(mimeType);
-	
+    
     return (IMAPPart *) attachment->autorelease();
 }
 
 IMAPPart * IMAPPart::attachmentWithIMAPBody1PartText(struct mailimap_body_type_text * text,
     struct mailimap_body_ext_1part * extension)
 {
-	IMAPPart * attachment;
-	
-	attachment = new IMAPPart();
+    IMAPPart * attachment;
+    
+    attachment = new IMAPPart();
     attachment->importIMAPFields(text->bd_fields, extension);
-	attachment->setMimeType(String::stringWithUTF8Format("text/%s", text->bd_media_text));
-	
+    attachment->setMimeType(String::stringWithUTF8Format("text/%s", text->bd_media_text));
+    
     return (IMAPPart *) attachment->autorelease();
 }
 
diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h
index eddc661a..039f620c 100644
--- a/src/core/imap/MCIMAPPart.h
+++ b/src/core/imap/MCIMAPPart.h
@@ -8,56 +8,57 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
-	class IMAPMessagePart;
-	class IMAPMultipart;
-
-	class IMAPPart : public AbstractPart {
-	public:
-		IMAPPart();
-		virtual ~IMAPPart();
-		
-		virtual void setPartID(String * partID);
-		virtual String * partID();
-
-		virtual void setSize(unsigned int size);
-		virtual unsigned int size();
-		
+    
+    class IMAPMessagePart;
+    class IMAPMultipart;
+    
+    class IMAPPart : public AbstractPart {
+    public:
+        IMAPPart();
+        virtual ~IMAPPart();
+        
+        virtual void setPartID(String * partID);
+        virtual String * partID();
+        
+        virtual void setSize(unsigned int size);
+        virtual unsigned int size();
+        
         virtual unsigned int decodedSize();
         
-		virtual void setEncoding(Encoding encoding);
-		virtual Encoding encoding();
-		
+        virtual void setEncoding(Encoding encoding);
+        virtual Encoding encoding();
+        
     public: // subclass behavior
-		IMAPPart(IMAPPart * other);
-		virtual Object * copy();
+        IMAPPart(IMAPPart * other);
+        virtual Object * copy();
         virtual HashMap * serializable();
         virtual void importSerializable(HashMap * serializable);
         
     public: // private
-		static AbstractPart * attachmentWithIMAPBody(struct mailimap_body * body);
-		
-		virtual void importIMAPFields(struct mailimap_body_fields * fields,
+        static AbstractPart * attachmentWithIMAPBody(struct mailimap_body * body);
+        
+        virtual void importIMAPFields(struct mailimap_body_fields * fields,
                                       struct mailimap_body_ext_1part * extension);
         
-	private:
-		String * mPartID;
-		Encoding mEncoding;
-		unsigned int mSize;
-		void init();
-		static AbstractPart * attachmentWithIMAPBodyInternal(struct mailimap_body * body, String * partID);
-		static AbstractPart * attachmentWithIMAPBody1Part(struct mailimap_body_type_1part * body_1part,
+    private:
+        String * mPartID;
+        Encoding mEncoding;
+        unsigned int mSize;
+        void init();
+        static AbstractPart * attachmentWithIMAPBodyInternal(struct mailimap_body * body, String * partID);
+        static AbstractPart * attachmentWithIMAPBody1Part(struct mailimap_body_type_1part * body_1part,
                                                           String * partID);
-		static IMAPMessagePart * attachmentWithIMAPBody1PartMessage(struct mailimap_body_type_msg * message,
+        static IMAPMessagePart * attachmentWithIMAPBody1PartMessage(struct mailimap_body_type_msg * message,
                                                                     struct mailimap_body_ext_1part * extension,
                                                                     String * partID);
-		static IMAPPart * attachmentWithIMAPBody1PartBasic(struct mailimap_body_type_basic * basic,
+        static IMAPPart * attachmentWithIMAPBody1PartBasic(struct mailimap_body_type_basic * basic,
                                                            struct mailimap_body_ext_1part * extension);
-		static IMAPPart * attachmentWithIMAPBody1PartText(struct mailimap_body_type_text * text,
+        static IMAPPart * attachmentWithIMAPBody1PartText(struct mailimap_body_type_text * text,
                                                           struct mailimap_body_ext_1part * extension);
-		static IMAPMultipart * attachmentWithIMAPBodyMultipart(struct mailimap_body_type_mpart * body_mpart,
+        static IMAPMultipart * attachmentWithIMAPBodyMultipart(struct mailimap_body_type_mpart * body_mpart,
                                                                String * partID);
-	};
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h
index cb68ddd1..22427afe 100644
--- a/src/core/imap/MCIMAPProgressCallback.h
+++ b/src/core/imap/MCIMAPProgressCallback.h
@@ -5,14 +5,15 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
-	class IMAPSession;
-
-	class IMAPProgressCallback {
-	public:
-		virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
-		virtual void itemsProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
-	};
+    
+    class IMAPSession;
+    
+    class IMAPProgressCallback {
+    public:
+        virtual void bodyProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
+        virtual void itemsProgress(IMAPSession * session, unsigned int current, unsigned int maximum) {};
+    };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index ed1c4b36..35b326b8 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -8,7 +8,7 @@
 #ifdef __cplusplus
 
 namespace mailcore {
-
+    
     class IMAPSearchExpression : public Object {
     public:
         IMAPSearchExpression();
@@ -20,7 +20,7 @@ namespace mailcore {
         virtual uint64_t longNumber();
         virtual time_t date();
         virtual IndexSet * uids();
-
+        
         
         virtual IMAPSearchExpression * leftExpression();
         virtual IMAPSearchExpression * rightExpression();
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index 205d53eb..2a4d2ca5 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2068,7 +2068,7 @@ IMAPSyncResult * IMAPSession::fetchMessages(String * folder, IMAPMessagesRequest
     needsGmailLabels = false;
     needsGmailMessageID = false;
     needsGmailThreadID = false;
-
+    
     fetch_type = mailimap_fetch_type_new_fetch_att_list_empty();
     fetch_att = mailimap_fetch_att_new_uid();
     mailimap_fetch_type_new_fetch_att_list_add(fetch_type, fetch_att);
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index a8a7279b..24e80967 100755
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -258,6 +258,7 @@ namespace mailcore {
         bool enableFeature(String * feature);
         void enableFeatures();
     };
+    
 }
 
 #endif
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index b511b0bd..186984ab 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -15,12 +15,12 @@
 #ifdef __cplusplus
 
 namespace mailcore {
- 
+    
     class IMAPSyncResult : public Object {
-	public:
-		IMAPSyncResult();
-		virtual ~IMAPSyncResult();
-		
+    public:
+        IMAPSyncResult();
+        virtual ~IMAPSyncResult();
+        
         virtual void setModifiedOrAddedMessages(Array * /* IMAPMessage */ messages);
         virtual Array * /* IMAPMessage */ modifiedOrAddedMessages();