diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 3e513295..065dd74a 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2586,6 +2586,8 @@ class MyForm(QtGui.QMainWindow):
             listOfSelectedRows[
                 self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0
         for currentRow in listOfSelectedRows:
+            labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(
+                currentRow, 0).text()
             addressAtCurrentRow = self.ui.tableWidgetAddressBook.item(
                 currentRow, 1).text()
             if self.ui.lineEditTo.text() == '':
@@ -2593,6 +2595,13 @@ class MyForm(QtGui.QMainWindow):
             else:
                 self.ui.lineEditTo.setText(str(
                     self.ui.lineEditTo.text()) + '; ' + str(addressAtCurrentRow))
+            # add the addresses to the To-Tableview
+            self.ui.tableWidgetRecipients.insertRow(0)
+            newItem = QtGui.QTableWidgetItem(unicode(labelAtCurrentRow, 'utf-8'))
+            self.ui.tableWidgetRecipients.setItem(0, 0, newItem)
+            newItem = QtGui.QTableWidgetItem(unicode(addressAtCurrentRow, 'utf-8'))
+            self.ui.tableWidgetRecipients.setItem(0, 1, newItem)
+            
         if listOfSelectedRows == {}:
             self.statusBar().showMessage(_translate(
                 "MainWindow", "No addresses selected."))
diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py
index c051c076..747801a0 100644
--- a/src/bitmessageqt/bitmessageui.py
+++ b/src/bitmessageqt/bitmessageui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Mon Aug 12 00:08:20 2013
+# Created: Mon Sep 09 19:04:13 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(795, 580)
+        MainWindow.resize(895, 576)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
@@ -43,12 +43,12 @@ class Ui_MainWindow(object):
         sizePolicy.setHeightForWidth(self.tabWidget.sizePolicy().hasHeightForWidth())
         self.tabWidget.setSizePolicy(sizePolicy)
         self.tabWidget.setMinimumSize(QtCore.QSize(0, 0))
-        self.tabWidget.setBaseSize(QtCore.QSize(0, 0))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.tabWidget.setFont(font)
         self.tabWidget.setTabPosition(QtGui.QTabWidget.North)
         self.tabWidget.setTabShape(QtGui.QTabWidget.Rounded)
+        self.tabWidget.setElideMode(QtCore.Qt.ElideNone)
         self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
         self.inbox = QtGui.QWidget()
         self.inbox.setObjectName(_fromUtf8("inbox"))
@@ -105,62 +105,109 @@ class Ui_MainWindow(object):
         self.send.setObjectName(_fromUtf8("send"))
         self.gridLayout_2 = QtGui.QGridLayout(self.send)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
-        font = QtGui.QFont()
-        font.setPointSize(7)
-        self.pushButtonLoadFromAddressBook.setFont(font)
-        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
-        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 3, 2, 1, 1)
-        self.pushButtonFetchNamecoinID = QtGui.QPushButton(self.send)
-        font = QtGui.QFont()
-        font.setPointSize(7)
-        self.pushButtonFetchNamecoinID.setFont(font)
-        self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
-        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 3, 3, 1, 1)
         self.label_4 = QtGui.QLabel(self.send)
         self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.gridLayout_2.addWidget(self.label_4, 5, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_4, 14, 0, 1, 1)
         self.comboBoxSendFrom = QtGui.QComboBox(self.send)
         self.comboBoxSendFrom.setMinimumSize(QtCore.QSize(300, 0))
         self.comboBoxSendFrom.setObjectName(_fromUtf8("comboBoxSendFrom"))
         self.gridLayout_2.addWidget(self.comboBoxSendFrom, 2, 1, 1, 1)
         self.label_3 = QtGui.QLabel(self.send)
         self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.gridLayout_2.addWidget(self.label_3, 4, 0, 1, 1)
-        self.labelFrom = QtGui.QLabel(self.send)
-        self.labelFrom.setText(_fromUtf8(""))
-        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
-        self.gridLayout_2.addWidget(self.labelFrom, 2, 2, 1, 3)
+        self.gridLayout_2.addWidget(self.label_3, 13, 0, 1, 1)
         self.radioButtonSpecific = QtGui.QRadioButton(self.send)
         self.radioButtonSpecific.setChecked(True)
         self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific"))
         self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 1, 1, 1)
-        self.lineEditTo = QtGui.QLineEdit(self.send)
-        self.lineEditTo.setObjectName(_fromUtf8("lineEditTo"))
-        self.gridLayout_2.addWidget(self.lineEditTo, 3, 1, 1, 1)
         self.textEditMessage = QtGui.QTextEdit(self.send)
         self.textEditMessage.setObjectName(_fromUtf8("textEditMessage"))
-        self.gridLayout_2.addWidget(self.textEditMessage, 5, 1, 2, 5)
-        self.label = QtGui.QLabel(self.send)
-        self.label.setObjectName(_fromUtf8("label"))
-        self.gridLayout_2.addWidget(self.label, 3, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.textEditMessage, 14, 1, 2, 3)
         self.label_2 = QtGui.QLabel(self.send)
         self.label_2.setObjectName(_fromUtf8("label_2"))
         self.gridLayout_2.addWidget(self.label_2, 2, 0, 1, 1)
         spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem, 6, 0, 1, 1)
+        self.gridLayout_2.addItem(spacerItem, 15, 0, 1, 1)
         self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
         self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
-        self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 1, 1, 3)
+        self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 1, 1, 1)
         self.lineEditSubject = QtGui.QLineEdit(self.send)
         self.lineEditSubject.setText(_fromUtf8(""))
         self.lineEditSubject.setObjectName(_fromUtf8("lineEditSubject"))
-        self.gridLayout_2.addWidget(self.lineEditSubject, 4, 1, 1, 5)
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_2.addItem(spacerItem1, 3, 4, 1, 1)
+        self.gridLayout_2.addWidget(self.lineEditSubject, 13, 1, 1, 3)
+        self.lineEditTo = QtGui.QLineEdit(self.send)
+        self.lineEditTo.setObjectName(_fromUtf8("lineEditTo"))
+        self.gridLayout_2.addWidget(self.lineEditTo, 4, 1, 1, 1)
+        self.labelFrom = QtGui.QLabel(self.send)
+        self.labelFrom.setText(_fromUtf8(""))
+        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
+        self.gridLayout_2.addWidget(self.labelFrom, 2, 2, 1, 3)
+        self.label = QtGui.QLabel(self.send)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout_2.addWidget(self.label, 4, 0, 1, 1)
+        self.comboBoxfindTo = QtGui.QComboBox(self.send)
+        self.comboBoxfindTo.setEnabled(True)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.comboBoxfindTo.sizePolicy().hasHeightForWidth())
+        self.comboBoxfindTo.setSizePolicy(sizePolicy)
+        self.comboBoxfindTo.setMinimumSize(QtCore.QSize(110, 0))
+        self.comboBoxfindTo.setEditable(True)
+        self.comboBoxfindTo.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.comboBoxfindTo.setFrame(True)
+        self.comboBoxfindTo.setObjectName(_fromUtf8("comboBoxfindTo"))
+        self.gridLayout_2.addWidget(self.comboBoxfindTo, 4, 3, 1, 1)
         self.pushButtonSend = QtGui.QPushButton(self.send)
         self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend"))
-        self.gridLayout_2.addWidget(self.pushButtonSend, 7, 5, 1, 1)
+        self.gridLayout_2.addWidget(self.pushButtonSend, 16, 3, 1, 1)
+        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonLoadFromAddressBook.sizePolicy().hasHeightForWidth())
+        self.pushButtonLoadFromAddressBook.setSizePolicy(sizePolicy)
+        self.pushButtonLoadFromAddressBook.setMinimumSize(QtCore.QSize(110, 0))
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonLoadFromAddressBook.setFont(font)
+        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
+        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 10, 3, 1, 1)
+        self.pushButtonFetchNamecoinID = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonFetchNamecoinID.sizePolicy().hasHeightForWidth())
+        self.pushButtonFetchNamecoinID.setSizePolicy(sizePolicy)
+        self.pushButtonFetchNamecoinID.setMinimumSize(QtCore.QSize(110, 0))
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonFetchNamecoinID.setFont(font)
+        self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
+        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 11, 3, 1, 1)
+        self.tableWidgetRecipients = QtGui.QTableWidget(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.tableWidgetRecipients.sizePolicy().hasHeightForWidth())
+        self.tableWidgetRecipients.setSizePolicy(sizePolicy)
+        self.tableWidgetRecipients.setMaximumSize(QtCore.QSize(16777215, 75))
+        self.tableWidgetRecipients.setAlternatingRowColors(True)
+        self.tableWidgetRecipients.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+        self.tableWidgetRecipients.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.tableWidgetRecipients.setObjectName(_fromUtf8("tableWidgetRecipients"))
+        self.tableWidgetRecipients.setColumnCount(2)
+        self.tableWidgetRecipients.setRowCount(0)
+        item = QtGui.QTableWidgetItem()
+        self.tableWidgetRecipients.setHorizontalHeaderItem(0, item)
+        item = QtGui.QTableWidgetItem()
+        self.tableWidgetRecipients.setHorizontalHeaderItem(1, item)
+        self.tableWidgetRecipients.horizontalHeader().setCascadingSectionResizes(True)
+        self.tableWidgetRecipients.horizontalHeader().setDefaultSectionSize(200)
+        self.tableWidgetRecipients.horizontalHeader().setHighlightSections(False)
+        self.tableWidgetRecipients.horizontalHeader().setStretchLastSection(True)
+        self.tableWidgetRecipients.verticalHeader().setVisible(False)
+        self.tableWidgetRecipients.verticalHeader().setDefaultSectionSize(20)
+        self.gridLayout_2.addWidget(self.tableWidgetRecipients, 10, 1, 2, 1)
         self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
         self.labelSendBroadcastWarning.setEnabled(True)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
@@ -170,7 +217,7 @@ class Ui_MainWindow(object):
         self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
         self.labelSendBroadcastWarning.setIndent(-1)
         self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
-        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 7, 1, 1, 4)
+        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 16, 1, 1, 1)
         icon2 = QtGui.QIcon()
         icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.send, icon2, _fromUtf8(""))
@@ -231,8 +278,8 @@ class Ui_MainWindow(object):
         self.pushButtonNewAddress = QtGui.QPushButton(self.youridentities)
         self.pushButtonNewAddress.setObjectName(_fromUtf8("pushButtonNewAddress"))
         self.gridLayout_3.addWidget(self.pushButtonNewAddress, 0, 0, 1, 1)
-        spacerItem2 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem2, 0, 1, 1, 1)
+        spacerItem1 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_3.addItem(spacerItem1, 0, 1, 1, 1)
         self.tableWidgetYourIdentities = QtGui.QTableWidget(self.youridentities)
         self.tableWidgetYourIdentities.setFrameShadow(QtGui.QFrame.Sunken)
         self.tableWidgetYourIdentities.setLineWidth(1)
@@ -253,6 +300,7 @@ class Ui_MainWindow(object):
         self.tableWidgetYourIdentities.setHorizontalHeaderItem(2, item)
         self.tableWidgetYourIdentities.horizontalHeader().setCascadingSectionResizes(True)
         self.tableWidgetYourIdentities.horizontalHeader().setDefaultSectionSize(346)
+        self.tableWidgetYourIdentities.horizontalHeader().setHighlightSections(False)
         self.tableWidgetYourIdentities.horizontalHeader().setMinimumSectionSize(52)
         self.tableWidgetYourIdentities.horizontalHeader().setSortIndicatorShown(True)
         self.tableWidgetYourIdentities.horizontalHeader().setStretchLastSection(True)
@@ -275,8 +323,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddSubscription = QtGui.QPushButton(self.subscriptions)
         self.pushButtonAddSubscription.setObjectName(_fromUtf8("pushButtonAddSubscription"))
         self.gridLayout_4.addWidget(self.pushButtonAddSubscription, 1, 0, 1, 1)
-        spacerItem3 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem3, 1, 1, 1, 1)
+        spacerItem2 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_4.addItem(spacerItem2, 1, 1, 1, 1)
         self.tableWidgetSubscriptions = QtGui.QTableWidget(self.subscriptions)
         self.tableWidgetSubscriptions.setAlternatingRowColors(True)
         self.tableWidgetSubscriptions.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
@@ -309,8 +357,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddAddressBook = QtGui.QPushButton(self.addressbook)
         self.pushButtonAddAddressBook.setObjectName(_fromUtf8("pushButtonAddAddressBook"))
         self.gridLayout_5.addWidget(self.pushButtonAddAddressBook, 1, 0, 1, 1)
-        spacerItem4 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_5.addItem(spacerItem4, 1, 1, 1, 1)
+        spacerItem3 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_5.addItem(spacerItem3, 1, 1, 1, 1)
         self.tableWidgetAddressBook = QtGui.QTableWidget(self.addressbook)
         self.tableWidgetAddressBook.setAlternatingRowColors(True)
         self.tableWidgetAddressBook.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -345,8 +393,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddBlacklist = QtGui.QPushButton(self.blackwhitelist)
         self.pushButtonAddBlacklist.setObjectName(_fromUtf8("pushButtonAddBlacklist"))
         self.gridLayout_6.addWidget(self.pushButtonAddBlacklist, 2, 0, 1, 1)
-        spacerItem5 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_6.addItem(spacerItem5, 2, 1, 1, 1)
+        spacerItem4 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.gridLayout_6.addItem(spacerItem4, 2, 1, 1, 1)
         self.tableWidgetBlacklist = QtGui.QTableWidget(self.blackwhitelist)
         self.tableWidgetBlacklist.setAlternatingRowColors(True)
         self.tableWidgetBlacklist.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
@@ -425,10 +473,10 @@ class Ui_MainWindow(object):
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/networkstatus.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.networkstatus, icon9, _fromUtf8(""))
-        self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
+        self.gridLayout.addWidget(self.tabWidget, 1, 0, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 18))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 895, 18))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -490,22 +538,19 @@ class Ui_MainWindow(object):
         self.menubar.addAction(self.menuHelp.menuAction())
 
         self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.setCurrentIndex(1)
+        self.comboBoxfindTo.setCurrentIndex(-1)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide)
         QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show)
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
-        MainWindow.setTabOrder(self.tabWidget, self.tableWidgetInbox)
         MainWindow.setTabOrder(self.tableWidgetInbox, self.textEditInboxMessage)
         MainWindow.setTabOrder(self.textEditInboxMessage, self.radioButtonSpecific)
         MainWindow.setTabOrder(self.radioButtonSpecific, self.radioButtonBroadcast)
         MainWindow.setTabOrder(self.radioButtonBroadcast, self.comboBoxSendFrom)
-        MainWindow.setTabOrder(self.comboBoxSendFrom, self.lineEditTo)
-        MainWindow.setTabOrder(self.lineEditTo, self.pushButtonLoadFromAddressBook)
-        MainWindow.setTabOrder(self.pushButtonLoadFromAddressBook, self.lineEditSubject)
+        MainWindow.setTabOrder(self.comboBoxSendFrom, self.lineEditSubject)
         MainWindow.setTabOrder(self.lineEditSubject, self.textEditMessage)
-        MainWindow.setTabOrder(self.textEditMessage, self.pushButtonSend)
-        MainWindow.setTabOrder(self.pushButtonSend, self.tableWidgetSent)
+        MainWindow.setTabOrder(self.textEditMessage, self.tableWidgetSent)
         MainWindow.setTabOrder(self.tableWidgetSent, self.textEditSentMessage)
         MainWindow.setTabOrder(self.textEditSentMessage, self.pushButtonNewAddress)
         MainWindow.setTabOrder(self.pushButtonNewAddress, self.tableWidgetYourIdentities)
@@ -538,8 +583,6 @@ class Ui_MainWindow(object):
         item = self.tableWidgetInbox.horizontalHeaderItem(3)
         item.setText(_translate("MainWindow", "Received", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), _translate("MainWindow", "Inbox", None))
-        self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None))
-        self.pushButtonFetchNamecoinID.setText(_translate("MainWindow", "Fetch Namecoin ID", None))
         self.label_4.setText(_translate("MainWindow", "Message:", None))
         self.label_3.setText(_translate("MainWindow", "Subject:", None))
         self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
@@ -548,10 +591,17 @@ class Ui_MainWindow(object):
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>", None))
-        self.label.setText(_translate("MainWindow", "To:", None))
         self.label_2.setText(_translate("MainWindow", "From:", None))
         self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
+        self.label.setText(_translate("MainWindow", "To:", None))
         self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
+        self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None))
+        self.pushButtonFetchNamecoinID.setText(_translate("MainWindow", "Fetch Namecoin ID", None))
+        self.tableWidgetRecipients.setSortingEnabled(True)
+        item = self.tableWidgetRecipients.horizontalHeaderItem(0)
+        item.setText(_translate("MainWindow", "Name or Label", None))
+        item = self.tableWidgetRecipients.horizontalHeaderItem(1)
+        item.setText(_translate("MainWindow", "Address", None))
         self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
         self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
@@ -630,3 +680,13 @@ class Ui_MainWindow(object):
         self.actionJoinChan.setText(_translate("MainWindow", "Join / Create chan", None))
 
 import bitmessage_icons_rc
+
+if __name__ == "__main__":
+    import sys
+    app = QtGui.QApplication(sys.argv)
+    MainWindow = QtGui.QMainWindow()
+    ui = Ui_MainWindow()
+    ui.setupUi(MainWindow)
+    MainWindow.show()
+    sys.exit(app.exec_())
+
diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui
index 69ab7f34..742992ce 100644
--- a/src/bitmessageqt/bitmessageui.ui
+++ b/src/bitmessageqt/bitmessageui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>795</width>
-    <height>580</height>
+    <width>895</width>
+    <height>576</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
     <property name="margin">
      <number>0</number>
     </property>
-    <item row="0" column="0">
+    <item row="1" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -39,12 +39,6 @@
         <height>0</height>
        </size>
       </property>
-      <property name="baseSize">
-       <size>
-        <width>0</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="font">
        <font>
         <pointsize>9</pointsize>
@@ -59,6 +53,9 @@
       <property name="currentIndex">
        <number>1</number>
       </property>
+      <property name="elideMode">
+       <enum>Qt::ElideNone</enum>
+      </property>
       <widget class="QWidget" name="inbox">
        <attribute name="icon">
         <iconset resource="bitmessage_icons.qrc">
@@ -195,7 +192,7 @@
         <string>Send</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="8" column="0">
+        <item row="14" column="0">
          <widget class="QLabel" name="label_4">
           <property name="text">
            <string>Message:</string>
@@ -212,7 +209,7 @@
           </property>
          </widget>
         </item>
-        <item row="7" column="0">
+        <item row="13" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
            <string>Subject:</string>
@@ -229,10 +226,7 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
-         <widget class="QLineEdit" name="lineEditTo"/>
-        </item>
-        <item row="8" column="1" rowspan="2" colspan="5">
+        <item row="14" column="1" rowspan="2" colspan="3">
          <widget class="QTextEdit" name="textEditMessage">
           <property name="html">
            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -243,13 +237,6 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>To:</string>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="0">
          <widget class="QLabel" name="label_2">
           <property name="text">
@@ -257,7 +244,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="9" column="0">
+        <item row="15" column="0">
          <spacer name="verticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@ -270,21 +257,180 @@ p, li { white-space: pre-wrap; }
           </property>
          </spacer>
         </item>
-        <item row="7" column="1" colspan="5">
+        <item row="1" column="1">
+         <widget class="QRadioButton" name="radioButtonBroadcast">
+          <property name="text">
+           <string>Broadcast to everyone who is subscribed to your address</string>
+          </property>
+         </widget>
+        </item>
+        <item row="13" column="1" colspan="3">
          <widget class="QLineEdit" name="lineEditSubject">
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
-        <item row="10" column="5">
+        <item row="4" column="1">
+         <widget class="QLineEdit" name="lineEditTo"/>
+        </item>
+        <item row="2" column="2" colspan="3">
+         <widget class="QLabel" name="labelFrom">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>To:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="3">
+         <widget class="QComboBox" name="comboBoxfindTo">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="editable">
+           <bool>true</bool>
+          </property>
+          <property name="currentIndex">
+           <number>-1</number>
+          </property>
+          <property name="insertPolicy">
+           <enum>QComboBox::NoInsert</enum>
+          </property>
+          <property name="frame">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="3">
          <widget class="QPushButton" name="pushButtonSend">
           <property name="text">
            <string>Send</string>
           </property>
          </widget>
         </item>
-        <item row="10" column="1" colspan="4">
+        <item row="10" column="3">
+         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Load from Address book</string>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="3">
+         <widget class="QPushButton" name="pushButtonFetchNamecoinID">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Fetch Namecoin ID</string>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="1" rowspan="2">
+         <widget class="QTableWidget" name="tableWidgetRecipients">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>75</height>
+           </size>
+          </property>
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
+          </property>
+          <property name="horizontalScrollMode">
+           <enum>QAbstractItemView::ScrollPerPixel</enum>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <attribute name="horizontalHeaderCascadingSectionResizes">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="horizontalHeaderDefaultSectionSize">
+           <number>200</number>
+          </attribute>
+          <attribute name="horizontalHeaderHighlightSections">
+           <bool>false</bool>
+          </attribute>
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+          <attribute name="verticalHeaderDefaultSectionSize">
+           <number>20</number>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Name or Label</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Address</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+        <item row="16" column="1">
          <widget class="QLabel" name="labelSendBroadcastWarning">
           <property name="enabled">
            <bool>true</bool>
@@ -303,86 +449,6 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QRadioButton" name="radioButtonBroadcast">
-          <property name="text">
-           <string>Broadcast to everyone who is subscribed to your address</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="4">
-         <widget class="QPushButton" name="pushButtonFetchNamecoinID">
-          <property name="font">
-           <font>
-            <pointsize>7</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Fetch Namecoin ID</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="4">
-         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
-          <property name="font">
-           <font>
-            <pointsize>7</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Load from Address book</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1" rowspan="2">
-         <widget class="QTableWidget" name="tableWidget">
-          <property name="sortingEnabled">
-           <bool>true</bool>
-          </property>
-          <attribute name="horizontalHeaderCascadingSectionResizes">
-           <bool>true</bool>
-          </attribute>
-          <attribute name="horizontalHeaderDefaultSectionSize">
-           <number>252</number>
-          </attribute>
-          <attribute name="horizontalHeaderHighlightSections">
-           <bool>false</bool>
-          </attribute>
-          <attribute name="horizontalHeaderStretchLastSection">
-           <bool>true</bool>
-          </attribute>
-          <column>
-           <property name="text">
-            <string>Name or Label</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>Address</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-        <item row="2" column="2" colspan="4">
-         <widget class="QLabel" name="labelFrom">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="2" colspan="4">
-         <spacer name="horizontalSpacer_6">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="sent">
@@ -1054,7 +1120,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>795</width>
+     <width>895</width>
      <height>18</height>
     </rect>
    </property>
@@ -1197,10 +1263,8 @@ p, li { white-space: pre-wrap; }
   <tabstop>radioButtonSpecific</tabstop>
   <tabstop>radioButtonBroadcast</tabstop>
   <tabstop>comboBoxSendFrom</tabstop>
-  <tabstop>lineEditTo</tabstop>
   <tabstop>lineEditSubject</tabstop>
   <tabstop>textEditMessage</tabstop>
-  <tabstop>pushButtonSend</tabstop>
   <tabstop>tableWidgetSent</tabstop>
   <tabstop>textEditSentMessage</tabstop>
   <tabstop>pushButtonNewAddress</tabstop>
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index ad597773..409d7e55 100644
--- a/src/bitmessageqt/settings.py
+++ b/src/bitmessageqt/settings.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Sat Aug 24 09:19:58 2013
+# Created: Mon Sep 09 19:01:31 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!