@@ -19,22 +19,23 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "XMPPContact.h"
 #import "XMPPContactManager.h"
+#import "XMPPContact.h"
+#import "XMPPContact+Private.h"
 #import "XMPPJID.h"
 #import "XMPPMulticastDelegate.h"
 #import "XMPPPresence.h"
 #import "XMPPRosterItem.h"
 
 @implementation XMPPContactManager
 @synthesize contacts = _contacts;
 
-- initWithConnection: (XMPPConnection*)connection
-	      roster: (XMPPRoster*)roster
+- initWithConnection: (XMPPConnection *)connection
+	      roster: (XMPPRoster *)roster
 {
 	self = [super init];
 
 	@try {
 		_connection = connection;
@@ -60,18 +61,18 @@
 
 	[super dealloc];
 }
 
 
-- (void)sendSubscribedToJID: (XMPPJID*)subscriber
+- (void)sendSubscribedToJID: (XMPPJID *)subscriber
 {
 	XMPPPresence *presence = [XMPPPresence presenceWithType: @"subscribed"];
 	[presence setTo: subscriber];
 	[_connection sendStanza: presence];
 }
 
-- (void)sendUnsubscribedToJID: (XMPPJID*)subscriber
+- (void)sendUnsubscribedToJID: (XMPPJID *)subscriber
 {
 	XMPPPresence *presence =
 	    [XMPPPresence presenceWithType: @"unsubscribed"];
 	[presence setTo: subscriber];
 	[_connection sendStanza: presence];
@@ -85,11 +86,11 @@
 - (void)removeDelegate: (id <XMPPContactManagerDelegate>)delegate
 {
 	[_delegates removeDelegate: delegate];
 }
 
-- (void)rosterWasReceived: (XMPPRoster*)roster
+- (void)rosterWasReceived: (XMPPRoster *)roster
 {
 	OFEnumerator *contactEnumerator;
 	XMPPContact *contact;
 	OFDictionary *rosterItems;
 	OFEnumerator *rosterItemEnumerator;
@@ -118,12 +119,12 @@
 				   withObject: self
 				   withObject: contact];
 	}
 }
 
--         (void)roster: (XMPPRoster*)roster
-  didReceiveRosterItem: (XMPPRosterItem*)rosterItem
+-         (void)roster: (XMPPRoster *)roster
+  didReceiveRosterItem: (XMPPRosterItem *)rosterItem
 {
 	XMPPContact *contact;
 	OFString *bareJID = [[rosterItem JID] bareJID];
 
 	contact = [_contacts objectForKey: bareJID];
@@ -154,12 +155,12 @@
 				   withObject: rosterItem];
 		[contact XMPP_setRosterItem: rosterItem];
 	}
 }
 
--   (void)connection: (XMPPConnection*)connection
-  didReceivePresence: (XMPPPresence*)presence
+-   (void)connection: (XMPPConnection *)connection
+  didReceivePresence: (XMPPPresence *)presence
 {
 	XMPPContact *contact;
 	XMPPJID *JID = [presence from];
 	OFString *type = [presence type];
 
@@ -197,12 +198,12 @@
 				   withObject: presence];
 		return;
 	}
 }
 
--  (void)connection: (XMPPConnection*)connection
-  didReceiveMessage: (XMPPMessage*)message
+-  (void)connection: (XMPPConnection *)connection
+  didReceiveMessage: (XMPPMessage *)message
 {
 	XMPPJID *JID = [message from];
 	XMPPContact *contact = [_contacts objectForKey: [JID bareJID]];
 
 	if (contact == nil)