diff --git a/Source/CTCoreFolder.m b/Source/CTCoreFolder.m
index a06a872..7827974 100644
--- a/Source/CTCoreFolder.m
+++ b/Source/CTCoreFolder.m
@@ -358,8 +358,11 @@
 		[messages addObject:msgObject];
 		[msgObject release];
 	}
-	if ( msgList != NULL )
-		carray_free(msgList->msg_tab); //I am only freeing the message array because the messages themselves are in use
+	if ( msgList != NULL ) {
+		//I am only freeing the message array because the messages themselves are in use
+		carray_free(msgList->msg_tab); 
+		free(msgList);
+	}
 	return messages;	
 }
 
diff --git a/Source/CTCoreMessage.m b/Source/CTCoreMessage.m
index c44c33d..a54e08a 100644
--- a/Source/CTCoreMessage.m
+++ b/Source/CTCoreMessage.m
@@ -58,7 +58,7 @@
 - (void)dealloc {
 	//TODO mailmessage_free?
 	if (myMessage != NULL)
-		mailmessage_flush(myMessage);
+		mailmessage_free(myMessage);
 	if (myFields != NULL)
 		mailimf_single_fields_free(myFields);
 	[myParsedMIME release];
diff --git a/main.m b/main.m
index 606358c..3fb1559 100644
--- a/main.m
+++ b/main.m
@@ -10,15 +10,21 @@ int main( int argc, char *argv[ ] )
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-//	CTCoreAccount *account = [[CTCoreAccount alloc] init];
+	CTCoreAccount *account = [[CTCoreAccount alloc] init];
+	CTCoreFolder *folder;
 //	CTCoreFolder *inbox, *newFolder, *archive;
 //	CTCoreMessage *msgOne;
 //	
-//	[account connectToServer:@"mail.theronge.com" port:143 connectionType:CONNECTION_TYPE_PLAIN 
-//				authType:IMAP_AUTH_TYPE_PLAIN login:@"mronge" password:@""];
-//	
-//	inbox = [account folderWithPath:@"INBOX"];
-//	//NSLog(@"%@", [inbox messageListFromUID:nil]);
+	[account connectToServer:@"mail.theronge.com" port:143 connectionType:CONNECTION_TYPE_STARTTLS 
+				authType:IMAP_AUTH_TYPE_PLAIN login:@"mronge" password:@""];
+	
+	folder = [account folderWithPath:@"INBOX"];
+	NSLog(@"%@", [folder messageObjectsFromUID:nil]);
+//	CTCoreMessage *msg;
+//	NSEnumerator *enumer = [set objectEnumerator];
+//	while ((msg == [enumer nextObject])) {
+//		
+//	}
 //	//NSLog(@"%@", [inbox messageObjectsFromIndex:500 toIndex:600]);
 //	
 //	msgOne = [inbox messageWithUID:@"1146070022-553"];
@@ -71,21 +77,21 @@ int main( int argc, char *argv[ ] )
 	
 	/* GMAIL Test */
 	
-	MailCoreEnableLogging();
-	
-	CTCoreMessage *msgOne = [[CTCoreMessage alloc] init];
-	[msgOne setTo:[NSSet setWithObject:[CTCoreAddress addressWithName:@"Bob" email:@"mronge@theronge.com"]]];
-	[msgOne setFrom:[NSSet setWithObject:[CTCoreAddress addressWithName:@"test" email:@"test@test.com"]]];
-	[msgOne setBody:@"Test"];
-	[msgOne setSubject:@"Subject"];	
-	[CTSMTPConnection sendMessage:msgOne server:@"mail.theronge.com" username:@"mronge" password:@"" port:25 useTLS:YES shouldAuth:YES];
+//	MailCoreEnableLogging();
+//	
+//	CTCoreMessage *msgOne = [[CTCoreMessage alloc] init];
+//	[msgOne setTo:[NSSet setWithObject:[CTCoreAddress addressWithName:@"Bob" email:@"mronge@theronge.com"]]];
+//	[msgOne setFrom:[NSSet setWithObject:[CTCoreAddress addressWithName:@"test" email:@"test@test.com"]]];
+//	[msgOne setBody:@"Test"];
+//	[msgOne setSubject:@"Subject"];	
+//	[CTSMTPConnection sendMessage:msgOne server:@"mail.theronge.com" username:@"mronge" password:@"" port:25 useTLS:YES shouldAuth:YES];
 	//[CTSMTPConnection sendMessage:msgOne server:@"mail.dls.net" username:@"" password:@"" port:25 useTLS:NO shouldAuth:NO];
 	//[archive disconnect];
 	//[account disconnect];
 	//[account release];
 	
-	while(1) {}
-	
 	[pool release];
+		
+	while(1) {}
 	return 0;
 }