diff --git a/macosx/EMKeychain/EMKeychainItem.h b/macosx/EMKeychain/EMKeychainItem.h
new file mode 100644
index 000000000..7464e403c
--- /dev/null
+++ b/macosx/EMKeychain/EMKeychainItem.h
@@ -0,0 +1,74 @@
+/*Copyright (c) 2007 Extendmac, LLC. <support@extendmac.com>
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+#import <Security/Security.h>
+
+@interface EMKeychainItem : NSObject 
+{
+	NSString *myPassword;
+	NSString *myUsername;
+	NSString *myLabel;
+	SecKeychainItemRef coreKeychainItem;
+}
+- (NSString *)password;
+- (NSString *)username;
+- (NSString *)label;
+- (BOOL)setPassword:(NSString *)newPassword;
+- (BOOL)setUsername:(NSString *)newUsername;
+- (BOOL)setLabel:(NSString *)newLabel;
+@end 
+
+@interface EMKeychainItem (Private)
+- (BOOL)modifyAttributeWithTag:(SecItemAttr)attributeTag toBeString:(NSString *)newStringValue;
+@end
+
+@interface EMGenericKeychainItem : EMKeychainItem
+{
+	NSString *myServiceName;
+}
++ (id)genericKeychainItem:(SecKeychainItemRef)item forServiceName:(NSString *)serviceName username:(NSString *)username password:(NSString *)password;
+- (NSString *)serviceName;
+- (BOOL)setServiceName:(NSString *)newServiceName;
+@end
+
+@interface EMInternetKeychainItem : EMKeychainItem
+{
+	NSString *myServer;
+	NSString *myPath;
+	int myPort;
+	SecProtocolType myProtocol;
+}
++ (id)internetKeychainItem:(SecKeychainItemRef)item forServer:(NSString *)server username:(NSString *)username password:(NSString *)password path:(NSString *)path port:(int)port protocol:(SecProtocolType)protocol;
+- (NSString *)server;
+- (NSString *)path;
+- (int)port;
+- (SecProtocolType)protocol;
+- (BOOL)setServer:(NSString *)newServer;
+- (BOOL)setPath:(NSString *)newPath;
+- (BOOL)setPort:(int)newPort;
+- (BOOL)setProtocol:(SecProtocolType)newProtocol;
+@end
\ No newline at end of file
diff --git a/macosx/EMKeychain/EMKeychainItem.m b/macosx/EMKeychain/EMKeychainItem.m
new file mode 100644
index 000000000..a9da29735
--- /dev/null
+++ b/macosx/EMKeychain/EMKeychainItem.m
@@ -0,0 +1,213 @@
+/*Copyright (c) 2007 Extendmac, LLC. <support@extendmac.com>
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#import "EMKeychainItem.h"
+
+@implementation EMKeychainItem
+- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item username:(NSString *)username password:(NSString *)password
+{
+	if ((self = [super init]))
+	{
+		coreKeychainItem = item;
+		[self setValue:username forKey:@"myUsername"];
+		[self setValue:password forKey:@"myPassword"];
+		return self;
+	}
+	return nil;
+}
+- (NSString *)password
+{
+	return myPassword;
+}
+- (NSString *)username
+{
+	return myUsername;
+}
+- (NSString *)label
+{
+	return myLabel;
+}
+
+- (BOOL)setPassword:(NSString *)newPasswordString
+{
+	if (!newPasswordString)
+	{
+		return NO;
+	}
+	[self willChangeValueForKey:@"password"];
+	[myPassword autorelease];
+	myPassword = [newPasswordString copy];
+	[self didChangeValueForKey:@"password"];
+	
+	const char *newPassword = [newPasswordString UTF8String];
+	OSStatus returnStatus = SecKeychainItemModifyAttributesAndData(coreKeychainItem, NULL, strlen(newPassword), (void *)newPassword);
+	return (returnStatus == noErr);	
+}
+- (BOOL)setUsername:(NSString *)newUsername
+{
+	[self willChangeValueForKey:@"username"];
+	[myUsername autorelease];
+	myUsername = [newUsername copy];
+	[self didChangeValueForKey:@"username"];	
+	
+	return [self modifyAttributeWithTag:kSecAccountItemAttr toBeString:newUsername];
+}
+- (BOOL)setLabel:(NSString *)newLabel
+{
+	[self willChangeValueForKey:@"label"];
+	[myLabel autorelease];
+	myLabel = [newLabel copy];
+	[self didChangeValueForKey:@"label"];
+	
+	return [self modifyAttributeWithTag:kSecLabelItemAttr toBeString:newLabel];
+}
+@end
+
+@implementation EMKeychainItem (Private)
+- (BOOL)modifyAttributeWithTag:(SecItemAttr)attributeTag toBeString:(NSString *)newStringValue
+{
+	const char *newValue = [newStringValue UTF8String];
+	SecKeychainAttribute attributes[1];
+	attributes[0].tag = attributeTag;
+	attributes[0].length = strlen(newValue);
+	attributes[0].data = (void *)newValue;
+	
+	SecKeychainAttributeList list;
+	list.count = 1;
+	list.attr = attributes;
+	
+	OSStatus returnStatus = SecKeychainItemModifyAttributesAndData(coreKeychainItem, &list, 0, NULL);
+	return (returnStatus == noErr);
+}
+@end
+
+@implementation EMGenericKeychainItem
+- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item serviceName:(NSString *)serviceName username:(NSString *)username password:(NSString *)password
+{
+	if ((self = [super initWithCoreKeychainItem:item username:username password:password]))
+	{
+		[self setValue:serviceName forKey:@"myServiceName"];
+		return self;
+	}
+	return nil;
+}
++ (id)genericKeychainItem:(SecKeychainItemRef)item forServiceName:(NSString *)serviceName username:(NSString *)username password:(NSString *)password
+{
+	return [[[EMGenericKeychainItem alloc] initWithCoreKeychainItem:item serviceName:serviceName username:username password:password] autorelease];
+}
+- (NSString *)serviceName
+{
+	return myServiceName;
+}
+
+- (BOOL)setServiceName:(NSString *)newServiceName
+{
+	[self willChangeValueForKey:@"serviceName"];
+	[myServiceName autorelease];
+	myServiceName = [newServiceName copy];
+	[self didChangeValueForKey:@"serviceName"];	
+	
+	return [self modifyAttributeWithTag:kSecServiceItemAttr toBeString:newServiceName];
+}
+@end
+
+@implementation EMInternetKeychainItem
+- (id)initWithCoreKeychainItem:(SecKeychainItemRef)item server:(NSString *)server username:(NSString *)username password:(NSString *)password path:(NSString *)path port:(int)port protocol:(SecProtocolType)protocol
+{
+	if ((self = [super initWithCoreKeychainItem:item username:username password:password]))
+	{
+		[self setValue:server forKey:@"myServer"];
+		[self setValue:path forKey:@"myPath"];
+		[self setValue:[NSNumber numberWithInt:port] forKey:@"myPort"];
+		[self setValue:[NSNumber numberWithInt:protocol] forKey:@"myProtocol"];
+		return self;
+	}
+	return nil;
+}
++ (id)internetKeychainItem:(SecKeychainItemRef)item forServer:(NSString *)server username:(NSString *)username password:(NSString *)password path:(NSString *)path port:(int)port protocol:(SecProtocolType)protocol
+{
+	return [[[EMInternetKeychainItem alloc] initWithCoreKeychainItem:item server:server username:username password:password path:path port:port protocol:protocol] autorelease];
+}
+- (NSString *)server
+{
+	return myServer;
+}
+- (NSString *)path
+{
+	return myPath;
+}
+- (int)port
+{
+	return myPort;
+}
+- (SecProtocolType)protocol
+{
+	return myProtocol;
+}
+
+- (BOOL)setServer:(NSString *)newServer
+{
+	[self willChangeValueForKey:@"server"];
+	[myServer autorelease];
+	myServer = [newServer copy];	
+	[self didChangeValueForKey:@"server"];
+	
+	return [self modifyAttributeWithTag:kSecServerItemAttr toBeString:newServer];
+}
+- (BOOL)setPath:(NSString *)newPath
+{
+	[self willChangeValueForKey:@"path"];
+	[myPath autorelease];
+	myPath = [newPath copy];
+	[self didChangeValueForKey:@"path"];
+	
+	return [self modifyAttributeWithTag:kSecPathItemAttr toBeString:newPath];
+}
+- (BOOL)setPort:(int)newPort
+{
+	[self willChangeValueForKey:@"port"];
+	myPort = newPort;
+	[self didChangeValueForKey:@"port"];
+	
+	return [self modifyAttributeWithTag:kSecPortItemAttr toBeString:[NSString stringWithFormat:@"%i", newPort]];
+}
+- (BOOL)setProtocol:(SecProtocolType)newProtocol
+{
+	[self willChangeValueForKey:@"protocol"];
+	myProtocol = newProtocol;
+	[self didChangeValueForKey:@"protocol"];
+	
+	SecKeychainAttribute attributes[1];
+	attributes[0].tag = kSecProtocolItemAttr;
+	attributes[0].length = sizeof(newProtocol);
+	attributes[0].data = (void *)newProtocol;
+	
+	SecKeychainAttributeList list;
+	list.count = 1;
+	list.attr = attributes;
+	
+	OSStatus returnStatus = SecKeychainItemModifyAttributesAndData(coreKeychainItem, &list, 0, NULL);
+	return (returnStatus == noErr);
+}
+@end
\ No newline at end of file
diff --git a/macosx/EMKeychain/EMKeychainProxy.h b/macosx/EMKeychain/EMKeychainProxy.h
new file mode 100644
index 000000000..9d643e856
--- /dev/null
+++ b/macosx/EMKeychain/EMKeychainProxy.h
@@ -0,0 +1,48 @@
+/*Copyright (c) 2007 Extendmac, LLC. <support@extendmac.com>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+//Last Changed on 2/07/08. Version 0.14
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+#import <Security/Security.h>
+
+#import "EMKeychainItem.h"
+
+@interface EMKeychainProxy : NSObject 
+{
+	BOOL _logErrors;
+}
++ (id)sharedProxy;
+- (void)lockKeychain;
+- (void)unlockKeychain;
+- (void)setLogsErrors:(BOOL)flag;
+
+- (EMGenericKeychainItem *)genericKeychainItemForService:(NSString *)serviceNameString withUsername:(NSString *)usernameString;
+- (EMInternetKeychainItem *)internetKeychainItemForServer:(NSString *)serverString withUsername:(NSString *)usernameString path:(NSString *)pathString port:(int)port protocol:(SecProtocolType)protocol;
+
+- (EMGenericKeychainItem *)addGenericKeychainItemForService:(NSString *)serviceNameString withUsername:(NSString *)usernameString password:(NSString *)passwordString;
+- (EMInternetKeychainItem *)addInternetKeychainItemForServer:(NSString *)serverString withUsername:(NSString *)usernameString password:(NSString *)passwordString path:(NSString *)pathString port:(int)port protocol:(SecProtocolType)protocol;
+
+@end
diff --git a/macosx/EMKeychain/EMKeychainProxy.m b/macosx/EMKeychain/EMKeychainProxy.m
new file mode 100644
index 000000000..d89feca56
--- /dev/null
+++ b/macosx/EMKeychain/EMKeychainProxy.m
@@ -0,0 +1,163 @@
+/*Copyright (c) 2007 Extendmac, LLC. <support@extendmac.com>
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#import "EMKeychainProxy.h"
+
+@implementation EMKeychainProxy
+
+static EMKeychainProxy* sharedProxy;
+
++ (id)sharedProxy
+{
+	if (!sharedProxy)
+	{
+		sharedProxy = [[EMKeychainProxy alloc] init];
+	}
+	return sharedProxy;
+}
+- (void)lockKeychain
+{
+	SecKeychainLock(NULL);
+}
+- (void)unlockKeychain
+{
+	SecKeychainUnlock(NULL, 0, NULL, NO);
+}
+- (void)setLogsErrors:(BOOL)flag
+{
+	_logErrors = flag;
+}
+
+#pragma mark -
+#pragma mark Getting Keychain Items
+- (EMGenericKeychainItem *)genericKeychainItemForService:(NSString *)serviceNameString withUsername:(NSString *)usernameString
+{
+	if (!usernameString || [usernameString length] == 0)
+	{
+		return nil;
+	}
+	
+	const char *serviceName = [serviceNameString UTF8String];
+	const char *username = [usernameString UTF8String];
+	
+	UInt32 passwordLength = 0;
+	char *password = nil;
+	
+	SecKeychainItemRef item = nil;
+	OSStatus returnStatus = SecKeychainFindGenericPassword(NULL, strlen(serviceName), serviceName, strlen(username), username, &passwordLength, (void **)&password, &item);
+	if (returnStatus != noErr || !item)
+	{
+		if (_logErrors)
+		{
+			NSLog(@"Error (%@) - %s", NSStringFromSelector(_cmd), GetMacOSStatusErrorString(returnStatus));
+		}
+		return nil;
+	}
+	NSString *passwordString = [NSString stringWithCString:password length:passwordLength];
+
+	return [EMGenericKeychainItem genericKeychainItem:item forServiceName:serviceNameString username:usernameString password:passwordString];
+}
+- (EMInternetKeychainItem *)internetKeychainItemForServer:(NSString *)serverString withUsername:(NSString *)usernameString path:(NSString *)pathString port:(int)port protocol:(SecProtocolType)protocol
+{
+	if (!usernameString || [usernameString length] == 0 || !serverString || [serverString length] == 0)
+	{
+		return nil;
+	}
+	const char *server = [serverString UTF8String];
+	const char *username = [usernameString UTF8String];
+	const char *path = [pathString UTF8String];
+	
+	if (!pathString || [pathString length] == 0)
+	{
+		path = "";
+	}
+	
+	UInt32 passwordLength = 0;
+	char *password = nil;
+	
+	SecKeychainItemRef item = nil;
+	OSStatus returnStatus = SecKeychainFindInternetPassword(NULL, strlen(server), server, 0, NULL, strlen(username), username, strlen(path), path, port, protocol, kSecAuthenticationTypeDefault, &passwordLength, (void **)&password, &item);
+	
+	if (returnStatus != noErr || !item)
+	{
+		if (_logErrors)
+		{
+			NSLog(@"Error (%@) - %s", NSStringFromSelector(_cmd), GetMacOSStatusErrorString(returnStatus));
+		}
+		return nil;
+	}
+	NSString *passwordString = [NSString stringWithCString:password length:passwordLength];
+	
+	return [EMInternetKeychainItem internetKeychainItem:item forServer:serverString username:usernameString password:passwordString path:pathString port:port protocol:protocol];
+}
+
+#pragma mark -
+#pragma mark Saving Passwords
+- (EMGenericKeychainItem *)addGenericKeychainItemForService:(NSString *)serviceNameString withUsername:(NSString *)usernameString password:(NSString *)passwordString
+{
+	if (!usernameString || [usernameString length] == 0 || !serviceNameString || [serviceNameString length] == 0)
+	{
+		return nil;
+	}	
+	const char *serviceName = [serviceNameString UTF8String];
+	const char *username = [usernameString UTF8String];
+	const char *password = [passwordString UTF8String];
+	
+	SecKeychainItemRef item = nil;
+	OSStatus returnStatus = SecKeychainAddGenericPassword(NULL, strlen(serviceName), serviceName, strlen(username), username, strlen(password), (void *)password, &item);
+	
+	if (returnStatus != noErr || !item)
+	{
+		NSLog(@"Error (%@) - %s", NSStringFromSelector(_cmd), GetMacOSStatusErrorString(returnStatus));
+		return nil;
+	}
+	return [EMGenericKeychainItem genericKeychainItem:item forServiceName:serviceNameString username:usernameString password:passwordString];
+}
+- (EMInternetKeychainItem *)addInternetKeychainItemForServer:(NSString *)serverString withUsername:(NSString *)usernameString password:(NSString *)passwordString path:(NSString *)pathString port:(int)port protocol:(SecProtocolType)protocol
+{
+	if (!usernameString || [usernameString length] == 0 || !serverString || [serverString length] == 0 || !passwordString || [passwordString length] == 0)
+	{
+		return nil;
+	}	
+	const char *server = [serverString UTF8String];
+	const char *username = [usernameString UTF8String];
+	const char *password = [passwordString UTF8String];
+	const char *path = [pathString UTF8String];
+	
+	if (!pathString || [pathString length] == 0)
+	{
+		path = "";
+	}
+
+	SecKeychainItemRef item = nil;
+	OSStatus returnStatus = SecKeychainAddInternetPassword(NULL, strlen(server), server, 0, NULL, strlen(username), username, strlen(path), path, port, protocol, kSecAuthenticationTypeDefault, strlen(password), (void *)password, &item);
+	
+	if (returnStatus != noErr || !item)
+	{
+		NSLog(@"Error (%@) - %s", NSStringFromSelector(_cmd), GetMacOSStatusErrorString(returnStatus));
+		return nil;
+	}
+	return [EMInternetKeychainItem internetKeychainItem:item forServer:serverString username:usernameString password:passwordString path:pathString port:port protocol:protocol];
+}
+@end
\ No newline at end of file