Cleaned example

10 files changed, 406 insertions, 453 deletions

diff --git a/example/mac/macExample/macExample.xcodeproj/project.pbxproj b/example/mac/macExample/macExample.xcodeproj/project.pbxproj
index 81392995..85a34d62 100644
--- a/example/mac/macExample/macExample.xcodeproj/project.pbxproj
+++ b/example/mac/macExample/macExample.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		C64FF38416AF97F400F8C162 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = C64FF38316AF97F400F8C162 /* main.mm */; };
 		C6BD2873170BC5C500A91AC1 /* MCOCIDURLProtocol.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6BD2870170BC5C500A91AC1 /* MCOCIDURLProtocol.mm */; };
 		C6BD2874170BC5C500A91AC1 /* MCOMessageView.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6BD2872170BC5C500A91AC1 /* MCOMessageView.mm */; };
+		C6BD28B4170BDFE500A91AC1 /* MailCore2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD28B3170BDFE500A91AC1 /* MailCore2.framework */; };
 		C6D42BB616ABB39A002BB4F9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6D42BB516ABB39A002BB4F9 /* Cocoa.framework */; };
 		C6D42BC916ABB39A002BB4F9 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C6D42BC816ABB39A002BB4F9 /* AppDelegate.m */; };
 		C6D42BCC16ABB39A002BB4F9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6D42BCA16ABB39A002BB4F9 /* MainMenu.xib */; };
@@ -54,6 +55,13 @@
 			remoteGlobalIDString = C64EA536169E772200778456;
 			remoteInfo = mailcore2;
 		};
+		C6BD28B2170BDFE500A91AC1 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C6BD2877170BC8ED00A91AC1 /* mailcore2.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = C6BD288D170BD71100A91AC1;
+			remoteInfo = "mailcore osx";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -84,6 +92,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C6BD28B4170BDFE500A91AC1 /* MailCore2.framework in Frameworks */,
 				C6D42BE516ABB511002BB4F9 /* WebKit.framework in Frameworks */,
 				C6D42BB616ABB39A002BB4F9 /* Cocoa.framework in Frameworks */,
 			);
@@ -135,6 +144,7 @@
 				C6BD2881170BC8ED00A91AC1 /* libmailcore2-ios.a */,
 				C6BD2883170BC8ED00A91AC1 /* tests */,
 				C6BD2885170BC8ED00A91AC1 /* test-ios.app */,
+				C6BD28B3170BDFE500A91AC1 /* MailCore2.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -284,6 +294,13 @@
 			remoteRef = C6BD2884170BC8ED00A91AC1 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		C6BD28B3170BDFE500A91AC1 /* MailCore2.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = MailCore2.framework;
+			remoteRef = C6BD28B2170BDFE500A91AC1 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -402,21 +419,6 @@
 					"$(SRCROOT)/../../../Externals/icu4c/lib",
 					"$(SRCROOT)/../../../Externals/ctemplate/lib",
 				);
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-letpan",
-					"-licudata",
-					"-licui18n",
-					"-licuuc",
-					"-lxml2",
-					"-lssl",
-					"-lcrypto",
-					"-lsasl2",
-					"-liconv",
-					"-lctemplate",
-					"-ltidy",
-					"-lmailcore2",
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -440,21 +442,6 @@
 					"$(SRCROOT)/../../../Externals/icu4c/lib",
 					"$(SRCROOT)/../../../Externals/ctemplate/lib",
 				);
-				OTHER_LDFLAGS = (
-					"-ObjC",
-					"-letpan",
-					"-licudata",
-					"-licui18n",
-					"-licuuc",
-					"-lxml2",
-					"-lssl",
-					"-lcrypto",
-					"-lsasl2",
-					"-liconv",
-					"-lctemplate",
-					"-ltidy",
-					"-lmailcore2",
-				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/example/mac/macExample/macExample/AppDelegate.h b/example/mac/macExample/macExample/AppDelegate.h
index a47dfbad..1d0ba332 100644
--- a/example/mac/macExample/macExample/AppDelegate.h
+++ b/example/mac/macExample/macExample/AppDelegate.h
@@ -8,8 +8,19 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface AppDelegate : NSObject <NSApplicationDelegate>
+@class MCTMsgListViewController;
 
-@property (assign) IBOutlet NSWindow *window;
+@interface AppDelegate : NSObject <NSApplicationDelegate> {
+    IBOutlet NSButton * _loginButton;
+    IBOutlet NSButton * _cancelButton;
+    IBOutlet NSTextField * _loginTextField;
+    IBOutlet NSTextField * _passwordTextField;
+    IBOutlet NSProgressIndicator * _progressView;
+    IBOutlet MCTMsgListViewController * _msgListViewController;
+    IBOutlet NSWindow * _accountWindow;
+}
+
+- (IBAction) accountLogin:(id)sender;
+- (IBAction) accountCancel:(id)sender;
 
 @end
diff --git a/example/mac/macExample/macExample/AppDelegate.m b/example/mac/macExample/macExample/AppDelegate.m
index 8f89fe10..12c744e8 100644
--- a/example/mac/macExample/macExample/AppDelegate.m
+++ b/example/mac/macExample/macExample/AppDelegate.m
@@ -8,16 +8,122 @@
 
 #import "AppDelegate.h"
 
-@implementation AppDelegate
+#import <MailCore/MailCore.h>
 
-- (void)dealloc
+#import "MCTMsgListViewController.h"
+
+@interface AppDelegate () <NSTextFieldDelegate>
+
+@end
+
+@implementation AppDelegate {
+    MCOIMAPSession * _session;
+    MCOIMAPOperation * _checkOp;
+}
+
+- (void) dealloc
 {
     [super dealloc];
 }
 
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+- (void) awakeFromNib
+{
+    [_loginTextField setDelegate:self];
+    [_passwordTextField setDelegate:self];
+}
+
+- (void) applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    [self _updateState];
+    
+    NSString * login = [[NSUserDefaults standardUserDefaults] stringForKey:@"Login"];
+    NSString * password = [[NSUserDefaults standardUserDefaults] stringForKey:@"Password"];
+    
+    if (([login length] == 0) || ([password length] == 0)) {
+        [_accountWindow makeKeyAndOrderFront:nil];
+    }
+    else {
+        [_loginTextField setStringValue:login];
+        [_passwordTextField setStringValue:password];
+    }
+}
+
+- (void) accountLogin:(id)sender
+{
+    NSString * login = [_loginTextField stringValue];
+    NSString * password = [_passwordTextField stringValue];
+    
+    NSLog(@"try login");
+    _session = [[MCOIMAPSession alloc] init];
+    [_session setHostname:@"imap.gmail.com"];
+    [_session setPort:993];
+    [_session setUsername:login];
+    [_session setPassword:password];
+    [_session setConnectionType:MCOConnectionTypeTLS];
+    _checkOp = [[_session checkAccountOperation] retain];
+    NSLog(@"start op");
+    [_checkOp start:^(NSError * error) {
+        [_accountWindow orderOut:nil];
+        
+        NSString * login = [_loginTextField stringValue];
+        NSString * password = [_passwordTextField stringValue];
+        [[NSUserDefaults standardUserDefaults] setObject:login forKey:@"Login"];
+        [[NSUserDefaults standardUserDefaults] setObject:password forKey:@"Password"];
+        
+        [_checkOp release];
+        _checkOp = nil;
+        [_session release];
+        _session = nil;
+        
+        [self _updateState];
+        
+        NSLog(@"op done %@", error);
+        
+        [_msgListViewController connect];
+    }];
+    
+    [self _updateState];
+}
+
+- (void) accountCancel:(id)sender
+{
+    [_checkOp cancel];
+    [_checkOp release];
+    _checkOp = nil;
+    [_session release];
+    _session = nil;
+    
+    [self _updateState];
+}
+
+- (void) _updateState
+{
+    if (_checkOp == nil) {
+        [_loginTextField setEnabled:YES];
+        [_passwordTextField setEnabled:YES];
+        NSString * login = [_loginTextField stringValue];
+        NSString * password = [_passwordTextField stringValue];
+        if (([login length] > 0) && ([password length] > 0)) {
+            [_loginButton setEnabled:YES];
+        }
+        else {
+            [_loginButton setEnabled:NO];
+        }
+        [_cancelButton setEnabled:NO];
+        [_progressView stopAnimation:nil];
+    }
+    else {
+        [_loginTextField setEnabled:NO];
+        [_passwordTextField setEnabled:NO];
+        [_loginButton setEnabled:NO];
+        [_cancelButton setEnabled:YES];
+        [_progressView startAnimation:nil];
+    }
+}
+
+- (void) controlTextDidChange:(NSNotification *)aNotification
 {
-    // Insert code here to initialize your application
+    [self _updateState];
 }
 
 @end
diff --git a/example/mac/macExample/macExample/MCTMsgListViewController.h b/example/mac/macExample/macExample/MCTMsgListViewController.h
index fbd76411..4730e4fc 100644
--- a/example/mac/macExample/macExample/MCTMsgListViewController.h
+++ b/example/mac/macExample/macExample/MCTMsgListViewController.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
 
 @class MCTMsgViewController;
 
@@ -19,4 +19,6 @@
     NSArray * _messages;
 }
 
+- (void) connect;
+
 @end
diff --git a/example/mac/macExample/macExample/MCTMsgListViewController.m b/example/mac/macExample/macExample/MCTMsgListViewController.m
index b2275686..b49d61eb 100644
--- a/example/mac/macExample/macExample/MCTMsgListViewController.m
+++ b/example/mac/macExample/macExample/MCTMsgListViewController.m
@@ -8,12 +8,11 @@
 
 #import "MCTMsgListViewController.h"
 
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
 
 #import "MCTMsgViewController.h"
 
 #define FOLDER @"INBOX"
-//#define FOLDER @"[Gmail]/All Mail"
 
 @interface MCTMsgListViewController () <NSTableViewDelegate, NSTableViewDataSource>
 
@@ -23,10 +22,17 @@
 
 - (void) awakeFromNib
 {
+    [self connect];
+}
+
+- (void) connect
+{
     [_msgViewController setFolder:FOLDER];
     
     NSString * login = [[NSUserDefaults standardUserDefaults] stringForKey:@"Login"];
     NSString * password = [[NSUserDefaults standardUserDefaults] stringForKey:@"Password"];
+    if (([login length] == 0) || ([password length] == 0))
+        return;
     
     _session = [[MCOIMAPSession alloc] init];
     [_session setHostname:@"imap.gmail.com"];
diff --git a/example/mac/macExample/macExample/MCTMsgViewController.h b/example/mac/macExample/macExample/MCTMsgViewController.h
index a7bc0168..b620a24e 100644
--- a/example/mac/macExample/macExample/MCTMsgViewController.h
+++ b/example/mac/macExample/macExample/MCTMsgViewController.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
 
 @class MCOMessageView;
 @class MCOIMAPAsyncSession;
diff --git a/example/mac/macExample/macExample/MCTMsgViewController.m b/example/mac/macExample/macExample/MCTMsgViewController.m
index 2f8dea38..6af399b5 100644
--- a/example/mac/macExample/macExample/MCTMsgViewController.m
+++ b/example/mac/macExample/macExample/MCTMsgViewController.m
@@ -41,7 +41,7 @@
     [_message release];
     _message = [message retain];
     
-    if (0) {
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:@"FetchFullMessageEnabled"]) {
         [_messageView setDelegate:self];
         [_messageView setFolder:_folder];
         [_messageView setMessage:message];
diff --git a/example/mac/macExample/macExample/en.lproj/MainMenu.xib b/example/mac/macExample/macExample/en.lproj/MainMenu.xib
index a34a5ae2..a73aaf60 100644
--- a/example/mac/macExample/macExample/en.lproj/MainMenu.xib
+++ b/example/mac/macExample/macExample/en.lproj/MainMenu.xib
@@ -11,10 +11,13 @@
 			<string key="NS.object.0">3084</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
 			<string>NSCustomObject</string>
 			<string>NSCustomView</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
+			<string>NSProgressIndicator</string>
 			<string>NSScrollView</string>
 			<string>NSScroller</string>
 			<string>NSSecureTextField</string>
@@ -51,7 +54,7 @@
 				<array class="NSMutableArray" key="NSMenuItems">
 					<object class="NSMenuItem" id="694149608">
 						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">testUI</string>
+						<string key="NSTitle">macExample</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
@@ -65,11 +68,11 @@
 						</object>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">testUI</string>
+							<string key="NSTitle">macExample</string>
 							<array class="NSMutableArray" key="NSMenuItems">
 								<object class="NSMenuItem" id="238522557">
 									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About testUI</string>
+									<string key="NSTitle">About macExample</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
@@ -134,7 +137,7 @@
 								</object>
 								<object class="NSMenuItem" id="755159360">
 									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide testUI</string>
+									<string key="NSTitle">Hide macExample</string>
 									<string key="NSKeyEquiv">h</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -195,15 +198,6 @@
 						<object class="NSMenu" key="NSSubmenu" id="720053764">
 							<string key="NSTitle">File</string>
 							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="705341025">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">New</string>
-									<string key="NSKeyEquiv">n</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
 								<object class="NSMenuItem" id="354256217">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Account...</string>
@@ -212,39 +206,13 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="722745758">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open…</string>
-									<string key="NSKeyEquiv">o</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1025936716">
+								<object class="NSMenuItem" id="521030078">
 									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open Recent</string>
+									<string key="NSTitle">Fetch Full Message</string>
 									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="1065607017">
-										<string key="NSTitle">Open Recent</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="759406840">
-												<reference key="NSMenu" ref="1065607017"/>
-												<string key="NSTitle">Clear Menu</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</array>
-										<string key="NSName">_NSRecentDocumentsMenu</string>
-									</object>
 								</object>
 								<object class="NSMenuItem" id="425164168">
 									<reference key="NSMenu" ref="720053764"/>
@@ -266,53 +234,6 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="1023925487">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Save…</string>
-									<string key="NSKeyEquiv">s</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="579971712">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Revert to Saved</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1010469920">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="294629803">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Page Setup...</string>
-									<string key="NSKeyEquiv">P</string>
-									<int key="NSKeyEquivModMask">1179648</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSToolTip"/>
-								</object>
-								<object class="NSMenuItem" id="49223823">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Print…</string>
-									<string key="NSKeyEquiv">p</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
 							</array>
 						</object>
 					</object>
@@ -1195,39 +1116,6 @@
 							</array>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<array class="NSMutableArray" key="NSMenuItems">
-								<object class="NSMenuItem" id="102151532">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Show Toolbar</string>
-									<string key="NSKeyEquiv">t</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="237841660">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Customize Toolbar…</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</array>
-						</object>
-					</object>
 					<object class="NSMenuItem" id="713487014">
 						<reference key="NSMenu" ref="649796088"/>
 						<string key="NSTitle">Window</string>
@@ -1295,7 +1183,7 @@
 							<array class="NSMutableArray" key="NSMenuItems">
 								<object class="NSMenuItem" id="105068016">
 									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">testUI Help</string>
+									<string key="NSTitle">macExample Help</string>
 									<string key="NSKeyEquiv">?</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -1335,8 +1223,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{192, 477}</string>
 											<reference key="NSSuperview" ref="1057040196"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="958887582"/>
+											<reference key="NSNextKeyView" ref="849854472"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1346,7 +1233,6 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{192, 17}</string>
 												<reference key="NSSuperview" ref="958887582"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1057040196"/>
 												<string key="NSReuseIdentifierKey">_NS:16</string>
 												<reference key="NSTableView" ref="818403152"/>
@@ -1447,7 +1333,6 @@
 									</array>
 									<string key="NSFrame">{{1, 17}, {192, 477}}</string>
 									<reference key="NSSuperview" ref="665197104"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="818403152"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 									<reference key="NSDocView" ref="818403152"/>
@@ -1459,7 +1344,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="665197104"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1027823325"/>
 									<string key="NSReuseIdentifierKey">_NS:58</string>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1473,7 +1357,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 478}, {335, 16}}</string>
 									<reference key="NSSuperview" ref="665197104"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="220665056"/>
 									<string key="NSReuseIdentifierKey">_NS:60</string>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1491,7 +1374,6 @@
 									</array>
 									<string key="NSFrame">{{1, 0}, {192, 17}}</string>
 									<reference key="NSSuperview" ref="665197104"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="8853202"/>
 									<string key="NSReuseIdentifierKey">_NS:15</string>
 									<reference key="NSDocView" ref="8853202"/>
@@ -1501,8 +1383,7 @@
 							</array>
 							<string key="NSFrame">{{-1, -1}, {194, 495}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="1057040196"/>
+							<reference key="NSNextKeyView" ref="958887582"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSsFlags">133682</int>
 							<reference key="NSVScroller" ref="849854472"/>
@@ -1519,14 +1400,13 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrame">{{201, 0}, {567, 493}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<string key="NSClassName">MCOMessageView</string>
 						</object>
 					</array>
 					<string key="NSFrameSize">{768, 493}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="665197104"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1366, 746}}</string>
@@ -1536,20 +1416,20 @@
 			<object class="NSWindowTemplate" id="389393842">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{505, 474}, {385, 94}}</string>
+				<string key="NSWindowRect">{{505, 474}, {409, 123}}</string>
 				<int key="NSWTFlags">611845120</int>
 				<string key="NSWindowTitle">Account</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="370006470">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<array class="NSMutableArray" key="NSSubviews">
 						<object class="NSTextField" id="369746882">
 							<reference key="NSNextResponder" ref="370006470"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{116, 52}, {249, 22}}</string>
+							<string key="NSFrame">{{116, 81}, {249, 22}}</string>
 							<reference key="NSSuperview" ref="370006470"/>
 							<reference key="NSNextKeyView" ref="47969306"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -1580,7 +1460,7 @@
 						<object class="NSTextField" id="148390580">
 							<reference key="NSNextResponder" ref="370006470"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{72, 55}, {39, 17}}</string>
+							<string key="NSFrame">{{72, 84}, {39, 17}}</string>
 							<reference key="NSSuperview" ref="370006470"/>
 							<reference key="NSNextKeyView" ref="369746882"/>
 							<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -1605,7 +1485,7 @@
 						<object class="NSTextField" id="47969306">
 							<reference key="NSNextResponder" ref="370006470"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{47, 23}, {64, 17}}</string>
+							<string key="NSFrame">{{47, 52}, {64, 17}}</string>
 							<reference key="NSSuperview" ref="370006470"/>
 							<reference key="NSNextKeyView" ref="217026742"/>
 							<string key="NSReuseIdentifierKey">_NS:1535</string>
@@ -1625,8 +1505,9 @@
 						<object class="NSSecureTextField" id="217026742">
 							<reference key="NSNextResponder" ref="370006470"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{116, 20}, {249, 22}}</string>
+							<string key="NSFrame">{{116, 49}, {249, 22}}</string>
 							<reference key="NSSuperview" ref="370006470"/>
+							<reference key="NSNextKeyView" ref="602401876"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSecureTextFieldCell" key="NSCell" id="338490228">
@@ -1645,8 +1526,67 @@
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
+						<object class="NSButton" id="372944324">
+							<reference key="NSNextResponder" ref="370006470"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{296, 13}, {75, 32}}</string>
+							<reference key="NSSuperview" ref="370006470"/>
+							<reference key="NSNextKeyView" ref="758205814"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="496976666">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Login</string>
+								<reference key="NSSupport" ref="640234263"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="372944324"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="602401876">
+							<reference key="NSNextResponder" ref="370006470"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{214, 13}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="370006470"/>
+							<reference key="NSNextKeyView" ref="372944324"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="867739186">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="640234263"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="602401876"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSProgressIndicator" id="758205814">
+							<reference key="NSNextResponder" ref="370006470"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{373, 22}, {16, 16}}</string>
+							<reference key="NSSuperview" ref="370006470"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:945</string>
+							<int key="NSpiFlags">28938</int>
+							<double key="NSMaxValue">100</double>
+						</object>
 					</array>
-					<string key="NSFrameSize">{385, 94}</string>
+					<string key="NSFrameSize">{409, 123}</string>
+					<reference key="NSSuperview"/>
 					<reference key="NSNextKeyView" ref="148390580"/>
 					<string key="NSReuseIdentifierKey">_NS:20</string>
 				</object>
@@ -1710,30 +1650,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">print:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="49223823"/>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runPageLayout:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="294629803"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearRecentDocuments:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="759406840"/>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">performClose:</string>
 						<reference key="source" ref="1014"/>
 						<reference key="destination" ref="776162233"/>
@@ -1894,38 +1810,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">saveDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1023925487"/>
-					</object>
-					<int key="connectionID">362</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">revertDocumentToSaved:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="579971712"/>
-					</object>
-					<int key="connectionID">364</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">runToolbarCustomizationPalette:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="237841660"/>
-					</object>
-					<int key="connectionID">365</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleToolbarShown:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="102151532"/>
-					</object>
-					<int key="connectionID">366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">hide:</string>
 						<reference key="source" ref="1014"/>
 						<reference key="destination" ref="755159360"/>
@@ -1950,22 +1834,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">newDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="705341025"/>
-					</object>
-					<int key="connectionID">373</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="722745758"/>
-					</object>
-					<int key="connectionID">374</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">raiseBaseline:</string>
 						<reference key="source" ref="1014"/>
 						<reference key="destination" ref="941806246"/>
@@ -2350,6 +2218,118 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">loginTextField</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="369746882"/>
+					</object>
+					<int key="connectionID">634</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">passwordTextField</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="217026742"/>
+					</object>
+					<int key="connectionID">635</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">cancelButton</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="602401876"/>
+					</object>
+					<int key="connectionID">636</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">loginButton</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="372944324"/>
+					</object>
+					<int key="connectionID">637</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">progressView</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="758205814"/>
+					</object>
+					<int key="connectionID">638</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_loginTextField</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="369746882"/>
+					</object>
+					<int key="connectionID">639</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_passwordTextField</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="217026742"/>
+					</object>
+					<int key="connectionID">640</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_loginButton</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="372944324"/>
+					</object>
+					<int key="connectionID">641</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_cancelButton</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="602401876"/>
+					</object>
+					<int key="connectionID">642</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_progressView</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="758205814"/>
+					</object>
+					<int key="connectionID">643</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_msgListViewController</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="409855171"/>
+					</object>
+					<int key="connectionID">644</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_accountWindow</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="389393842"/>
+					</object>
+					<int key="connectionID">645</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">accountCancel:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="602401876"/>
+					</object>
+					<int key="connectionID">652</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">accountLogin:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="372944324"/>
+					</object>
+					<int key="connectionID">653</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="818403152"/>
 						<reference key="destination" ref="409855171"/>
@@ -2397,36 +2377,28 @@
 					<int key="connectionID">622</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.Login</string>
-						<reference key="source" ref="369746882"/>
-						<reference key="destination" ref="522483983"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="369746882"/>
-							<reference key="NSDestination" ref="522483983"/>
-							<string key="NSLabel">value: values.Login</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.Login</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="389393842"/>
+						<reference key="destination" ref="369746882"/>
 					</object>
-					<int key="connectionID">625</int>
+					<int key="connectionID">654</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: values.Password</string>
-						<reference key="source" ref="217026742"/>
+						<string key="label">value: values.FetchFullMessageEnabled</string>
+						<reference key="source" ref="521030078"/>
 						<reference key="destination" ref="522483983"/>
 						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="217026742"/>
+							<reference key="NSSource" ref="521030078"/>
 							<reference key="NSDestination" ref="522483983"/>
-							<string key="NSLabel">value: values.Password</string>
+							<string key="NSLabel">value: values.FetchFullMessageEnabled</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">values.Password</string>
+							<string key="NSKeyPath">values.FetchFullMessageEnabled</string>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">626</int>
+					<int key="connectionID">648</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2463,7 +2435,6 @@
 							<reference ref="694149608"/>
 							<reference ref="952259628"/>
 							<reference ref="379814623"/>
-							<reference ref="586577488"/>
 							<reference ref="302598603"/>
 							<reference ref="448692316"/>
 						</array>
@@ -2505,54 +2476,14 @@
 						<int key="objectID">81</int>
 						<reference key="object" ref="720053764"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1023925487"/>
-							<reference ref="49223823"/>
-							<reference ref="722745758"/>
-							<reference ref="705341025"/>
-							<reference ref="1025936716"/>
-							<reference ref="294629803"/>
 							<reference ref="776162233"/>
 							<reference ref="425164168"/>
-							<reference ref="579971712"/>
-							<reference ref="1010469920"/>
 							<reference ref="354256217"/>
+							<reference ref="521030078"/>
 						</array>
 						<reference key="parent" ref="379814623"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">75</int>
-						<reference key="object" ref="1023925487"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">78</int>
-						<reference key="object" ref="49223823"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">72</int>
-						<reference key="object" ref="722745758"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">82</int>
-						<reference key="object" ref="705341025"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="1025936716"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1065607017"/>
-						</array>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">77</int>
-						<reference key="object" ref="294629803"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">73</int>
 						<reference key="object" ref="776162233"/>
 						<reference key="parent" ref="720053764"/>
@@ -2563,29 +2494,6 @@
 						<reference key="parent" ref="720053764"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">112</int>
-						<reference key="object" ref="579971712"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">74</int>
-						<reference key="object" ref="1010469920"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="1065607017"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="759406840"/>
-						</array>
-						<reference key="parent" ref="1025936716"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">126</int>
-						<reference key="object" ref="759406840"/>
-						<reference key="parent" ref="1065607017"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">205</int>
 						<reference key="object" ref="789758025"/>
 						<array class="NSMutableArray" key="children">
@@ -2847,33 +2755,6 @@
 						<reference key="parent" ref="835318025"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="466310130"/>
-						</array>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="102151532"/>
-							<reference ref="237841660"/>
-						</array>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="102151532"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">298</int>
-						<reference key="object" ref="237841660"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">211</int>
 						<reference key="object" ref="676164635"/>
 						<array class="NSMutableArray" key="children">
@@ -3515,6 +3396,9 @@
 							<reference ref="148390580"/>
 							<reference ref="217026742"/>
 							<reference ref="47969306"/>
+							<reference ref="372944324"/>
+							<reference ref="602401876"/>
+							<reference ref="758205814"/>
 						</array>
 						<reference key="parent" ref="389393842"/>
 					</object>
@@ -3575,16 +3459,48 @@
 						<reference key="object" ref="522483983"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">627</int>
+						<reference key="object" ref="372944324"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="496976666"/>
+						</array>
+						<reference key="parent" ref="370006470"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">628</int>
+						<reference key="object" ref="496976666"/>
+						<reference key="parent" ref="372944324"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">629</int>
+						<reference key="object" ref="602401876"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="867739186"/>
+						</array>
+						<reference key="parent" ref="370006470"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">630</int>
+						<reference key="object" ref="867739186"/>
+						<reference key="parent" ref="602401876"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">631</int>
+						<reference key="object" ref="758205814"/>
+						<reference key="parent" ref="370006470"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">646</int>
+						<reference key="object" ref="521030078"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3628,10 +3544,6 @@
 				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="295.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3750,15 +3662,15 @@
 				<string key="620.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="621.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="627.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="628.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="631.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="646.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="77.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="78.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
@@ -3766,80 +3678,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">626</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">AppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">window</string>
-						<string key="NS.object.0">NSWindow</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">window</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppDelegate.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MCOMessageView</string>
-					<string key="superclassName">NSView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MCOMessageView.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MCTMsgListViewController</string>
-					<string key="superclassName">NSViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="_msgViewController">MCTMsgViewController</string>
-						<string key="_tableView">NSTableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="_msgViewController">
-							<string key="name">_msgViewController</string>
-							<string key="candidateClassName">MCTMsgViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="_tableView">
-							<string key="name">_tableView</string>
-							<string key="candidateClassName">NSTableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MCTMsgListViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MCTMsgViewController</string>
-					<string key="superclassName">NSViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">_messageView</string>
-						<string key="NS.object.0">MCOMessageView</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">_messageView</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">_messageView</string>
-							<string key="candidateClassName">MCOMessageView</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MCTMsgViewController.h</string>
-					</object>
-				</object>
-			</array>
+			<int key="maxID">654</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
diff --git a/example/mac/macExample/macExample/macExample-Info.plist b/example/mac/macExample/macExample/macExample-Info.plist
index 7b990dc4..39e003f6 100644
--- a/example/mac/macExample/macExample/macExample-Info.plist
+++ b/example/mac/macExample/macExample/macExample-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>org.mailcore.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.libmailcore.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/example/mac/macExample/macExample/main.mm b/example/mac/macExample/macExample/main.mm
index be0c2229..9572234a 100644
--- a/example/mac/macExample/macExample/main.mm
+++ b/example/mac/macExample/macExample/main.mm
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#include <mailcore/mailcore.h>
+#include <MailCore/MailCore.h>
 #include <unicode/putil.h>
 
 int main(int argc, char *argv[])