diff --git a/lib/gui.py b/lib/gui.py
index 5cd364e32..56be0dccd 100644
--- a/lib/gui.py
+++ b/lib/gui.py
@@ -1152,10 +1152,10 @@ class ElectrumWindow:
         for address in self.wallet.addressbook:
             label = self.wallet.labels.get(address)
             n = 0 
-            for item in self.wallet.transactions.values():
-                if address in item['outputs'] : n=n+1
-            tx = "None" if n==0 else "%d"%n
-            self.addressbook_list.append((address, label, tx))
+            for tx in self.wallet.transactions.values():
+                if address in map(lambda x:x[0], tx.outputs): n += 1
+
+            self.addressbook_list.append((address, label, "%d"%n))
 
     def update_history_tab(self):
         cursor = self.history_treeview.get_cursor()[0]
diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 41507196c..0531efd5b 100644
--- a/lib/gui_qt.py
+++ b/lib/gui_qt.py
@@ -1262,10 +1262,10 @@ class ElectrumWindow(QMainWindow):
             if address in alias_targets: continue
             label = self.wallet.labels.get(address,'')
             n = 0 
-            #for item in self.wallet.transactions.values():
-            #    if address in item['outputs'] : n=n+1
-            tx = "%d"%n
-            item = QTreeWidgetItem( [ address, label, tx] )
+            for tx in self.wallet.transactions.values():
+                if address in map(lambda x: x[0], tx.outputs): n += 1
+            
+            item = QTreeWidgetItem( [ address, label, "%d"%n] )
             item.setFont(0, QFont(MONOSPACE_FONT))
             l.addTopLevelItem(item)