diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index a4d8c62f..10fe1b75 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2178,13 +2178,15 @@ class MyForm(QtGui.QMainWindow):
 
     def rerenderComboBoxSendFromBroadcast(self):
         self.ui.comboBoxSendFromBroadcast.clear()
-        queryreturn = sqlQuery(
-            '''select label, address from subscriptions where enabled = 1'''
-            )
-        
-        for row in queryreturn:
-            label, address = row
-            self.ui.comboBoxSendFromBroadcast.insertItem(0, avatarize(address), unicode(label, 'utf-8'), address)
+        configSections = shared.config.sections()
+        for addressInKeysFile in configSections:
+            if addressInKeysFile != 'bitmessagesettings':
+                isEnabled = shared.config.getboolean(
+                    addressInKeysFile, 'enabled')  # I realize that this is poor programming practice but I don't care. It's easier for others to read.
+                isMaillinglist = shared.safeConfigGetBoolean(addressInKeysFile, 'mailinglist')
+                if isEnabled and isMaillinglist:
+                    self.ui.comboBoxSendFromBroadcast.insertItem(0, avatarize(addressInKeysFile), unicode(shared.config.get(
+                        addressInKeysFile, 'label'), 'utf-8'), addressInKeysFile)
         self.ui.comboBoxSendFromBroadcast.insertItem(0, '', '')
         if(self.ui.comboBoxSendFromBroadcast.count() == 2):
             self.ui.comboBoxSendFromBroadcast.setCurrentIndex(1)