@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2013, Florian Zeitz <florob@babelmonkeys.de>
+ * Copyright (c) 2013, 2016, Jonathan Schleifer <js@heap.zone>
  *
- * https://webkeks.org/git/?p=objxmpp.git
+ * https://heap.zone/git/?p=objxmpp.git
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice is present in all copies.
  *
@@ -26,10 +27,12 @@
 #import "XMPPMulticastDelegate.h"
 #import "XMPPPresence.h"
 #import "XMPPRosterItem.h"
 
 @implementation XMPPContactManager
+@synthesize contacts = _contacts;
+
 - initWithConnection: (XMPPConnection*)connection
 	      roster: (XMPPRoster*)roster
 {
 	self = [super init];
 
@@ -82,15 +85,10 @@
 - (void)removeDelegate: (id <XMPPContactManagerDelegate>)delegate
 {
 	[_delegates removeDelegate: delegate];
 }
 
-- (OFDictionary*)contacts
-{
-	OF_GETTER(_contacts, true)
-}
-
 - (void)rosterWasReceived: (XMPPRoster*)roster
 {
 	OFEnumerator *contactEnumerator;
 	XMPPContact *contact;
 	OFDictionary *rosterItems;