diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 5c26e627..3fb9d339 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -315,11 +315,13 @@ class MyForm(QtGui.QMainWindow):
         self.ui.comboboxFindLabel.addItem('')
         self.ui.comboboxFindLabel.setFrame(False)
         self.ui.comboboxFindLabel.setEditable(True)
+        self.ui.comboboxFindLabel.setInsertPolicy(0)
         self.ui.tableWidgetRecipients.setCellWidget(0, 0, self.ui.comboboxFindLabel)
         self.ui.comboboxFindAddress = QtGui.QComboBox()
         self.ui.comboboxFindAddress.addItem('BM-2D')
         self.ui.comboboxFindAddress.setFrame(False)
         self.ui.comboboxFindAddress.setEditable(True)
+        self.ui.comboboxFindAddress.setInsertPolicy(0)
         self.ui.tableWidgetRecipients.setCellWidget(0, 1, self.ui.comboboxFindAddress)
         
         QtCore.QObject.connect(self.ui.comboboxFindLabel, QtCore.SIGNAL(
@@ -374,7 +376,6 @@ class MyForm(QtGui.QMainWindow):
         shared.sqlSubmitQueue.put('')
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlLock.release()
-
         for row in queryreturn:
             label, address = row
             # address book
@@ -388,7 +389,10 @@ class MyForm(QtGui.QMainWindow):
             # tableWidgetRecipients ###
             self.ui.comboboxFindLabel.addItem(label)
             self.ui.comboboxFindAddress.addItem(address)
-            
+
+        # key binding for the "new recipient" comboboxes ###
+        self.ui.comboboxFindLabel.keyPressEvent = self.on_comboboxFindLabel_enter
+        self.ui.comboboxFindAddress.keyPressEvent = self.on_comboboxFindAddress_enter
 
         # Initialize the Subscriptions
         self.rerenderSubscriptions()
@@ -2576,6 +2580,54 @@ class MyForm(QtGui.QMainWindow):
         
     def on_comboboxFindAddress_change(self, int):
         self.ui.comboboxFindLabel.setCurrentIndex(int)
+
+    def on_comboboxFindLabel_enter(self, event):
+        if (event.key() == QtCore.Qt.Key_Enter) | (event.key() == QtCore.Qt.Key_Return):
+            index = text = self.ui.comboboxFindLabel.currentIndex()
+            text = self.ui.comboboxFindLabel.currentText()
+            found = self.ui.comboboxFindLabel.findText(text)
+            if found > 0:
+                # adjust both comboboxes on first "enter"
+                self.ui.comboboxFindAddress.setCurrentIndex(found)
+                self.ui.comboboxFindLabel.setCurrentIndex(found)
+                # so we have chosen a proper address
+                if index == found:
+                    # check whether that address is already in the list
+                    # ...
+                    addToBottom = False
+                    rowIndex = self.ui.tableWidgetRecipients.rowCount()-1 if addToBottom else 1
+                    # add the address to the list on second "enter"
+                    label = self.ui.comboboxFindLabel.currentText()
+                    self.ui.comboboxFindAddress.setCurrentIndex(found)
+                    address = self.ui.comboboxFindAddress.currentText()
+                    self.ui.tableWidgetRecipients.insertRow(rowIndex)
+                    newItem = QtGui.QTableWidgetItem(unicode(label, 'utf-8'))
+                    newItem.setFlags(
+                            QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+                    self.ui.tableWidgetRecipients.setItem(rowIndex, 0, newItem)
+                    newItem = QtGui.QTableWidgetItem(unicode(address, 'utf-8'))
+                    newItem.setFlags(
+                            QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
+                    self.ui.tableWidgetRecipients.setItem(rowIndex, 1, newItem)
+                    # clean up so we won't add it again
+                    self.ui.comboboxFindAddress.removeItem(found)
+                    self.ui.comboboxFindLabel.removeItem(found)
+                    self.ui.comboboxFindAddress.setCurrentIndex(0)
+                    self.ui.comboboxFindLabel.setCurrentIndex(0)
+            else:
+                self.ui.comboboxFindAddress.setCurrentIndex(0) # there you have the "BM-2D"
+                self.ui.comboboxFindLabel.setEditText(text) # otherwise you will lose the text on enter
+        return QtGui.QComboBox.keyPressEvent(self.ui.comboboxFindLabel, event)
+        
+    def on_comboboxFindAddress_enter(self, event):
+        if (event.key() == QtCore.Qt.Key_Enter) | (event.key() == QtCore.Qt.Key_Return):
+            index = self.ui.comboboxFindAddress.currentIndex()
+            print self.ui.comboboxFindAddress.currentText()
+        return QtGui.QComboBox.keyPressEvent(self.ui.comboboxFindAddress, event)
+
+    def on_combobox_submit(self):
+        # sanity check frist
+        
         
     # Group of functions for the Address Book dialog box
     def on_action_AddressBookNew(self):
diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py
index 747801a0..67223f43 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 Sep 09 19:04:13 2013
+# Created: Tue Sep 10 09:45:02 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -105,73 +105,6 @@ class Ui_MainWindow(object):
         self.send.setObjectName(_fromUtf8("send"))
         self.gridLayout_2 = QtGui.QGridLayout(self.send)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.label_4 = QtGui.QLabel(self.send)
-        self.label_4.setObjectName(_fromUtf8("label_4"))
-        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, 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.textEditMessage = QtGui.QTextEdit(self.send)
-        self.textEditMessage.setObjectName(_fromUtf8("textEditMessage"))
-        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, 15, 0, 1, 1)
-        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
-        self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
-        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, 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, 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)
@@ -183,7 +116,63 @@ class Ui_MainWindow(object):
         font.setPointSize(7)
         self.pushButtonFetchNamecoinID.setFont(font)
         self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
-        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 11, 3, 1, 1)
+        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 12, 4, 1, 1)
+        self.label_4 = QtGui.QLabel(self.send)
+        self.label_4.setObjectName(_fromUtf8("label_4"))
+        self.gridLayout_2.addWidget(self.label_4, 15, 0, 1, 1)
+        spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem, 16, 0, 1, 1)
+        self.label = QtGui.QLabel(self.send)
+        self.label.setObjectName(_fromUtf8("label"))
+        self.gridLayout_2.addWidget(self.label, 5, 0, 1, 1)
+        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)
+        self.label_3 = QtGui.QLabel(self.send)
+        self.label_3.setObjectName(_fromUtf8("label_3"))
+        self.gridLayout_2.addWidget(self.label_3, 14, 0, 1, 1)
+        self.lineEditTo = QtGui.QLineEdit(self.send)
+        self.lineEditTo.setObjectName(_fromUtf8("lineEditTo"))
+        self.gridLayout_2.addWidget(self.lineEditTo, 5, 2, 1, 1)
+        self.lineEditSubject = QtGui.QLineEdit(self.send)
+        self.lineEditSubject.setText(_fromUtf8(""))
+        self.lineEditSubject.setObjectName(_fromUtf8("lineEditSubject"))
+        self.gridLayout_2.addWidget(self.lineEditSubject, 14, 2, 1, 3)
+        self.comboBoxSendFrom = QtGui.QComboBox(self.send)
+        self.comboBoxSendFrom.setMinimumSize(QtCore.QSize(300, 0))
+        self.comboBoxSendFrom.setEditable(True)
+        self.comboBoxSendFrom.setInsertPolicy(QtGui.QComboBox.NoInsert)
+        self.comboBoxSendFrom.setObjectName(_fromUtf8("comboBoxSendFrom"))
+        self.gridLayout_2.addWidget(self.comboBoxSendFrom, 2, 2, 1, 1)
+        self.radioButtonSpecific = QtGui.QRadioButton(self.send)
+        self.radioButtonSpecific.setChecked(True)
+        self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific"))
+        self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 2, 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, 11, 4, 1, 1)
+        self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
+        self.labelSendBroadcastWarning.setEnabled(True)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.labelSendBroadcastWarning.sizePolicy().hasHeightForWidth())
+        self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
+        self.labelSendBroadcastWarning.setIndent(-1)
+        self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
+        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 17, 2, 1, 1)
+        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
+        self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
+        self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 2, 1, 1)
         self.tableWidgetRecipients = QtGui.QTableWidget(self.send)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -207,17 +196,16 @@ class Ui_MainWindow(object):
         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)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.labelSendBroadcastWarning.sizePolicy().hasHeightForWidth())
-        self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
-        self.labelSendBroadcastWarning.setIndent(-1)
-        self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
-        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 16, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.tableWidgetRecipients, 11, 2, 2, 1)
+        self.textEditMessage = QtGui.QTextEdit(self.send)
+        self.textEditMessage.setObjectName(_fromUtf8("textEditMessage"))
+        self.gridLayout_2.addWidget(self.textEditMessage, 15, 2, 2, 3)
+        self.pushButtonSend = QtGui.QPushButton(self.send)
+        self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend"))
+        self.gridLayout_2.addWidget(self.pushButtonSend, 17, 4, 1, 1)
+        self.labelFrom = QtGui.QLabel(self.send)
+        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
+        self.gridLayout_2.addWidget(self.labelFrom, 2, 4, 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(""))
@@ -539,7 +527,6 @@ class Ui_MainWindow(object):
 
         self.retranslateUi(MainWindow)
         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)
@@ -583,26 +570,27 @@ 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.pushButtonFetchNamecoinID.setText(_translate("MainWindow", "Fetch Namecoin ID", None))
         self.label_4.setText(_translate("MainWindow", "Message:", None))
+        self.label.setText(_translate("MainWindow", "To:", None))
+        self.label_2.setText(_translate("MainWindow", "From:", None))
         self.label_3.setText(_translate("MainWindow", "Subject:", None))
         self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
-        self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"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_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.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
+        self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", 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.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"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.pushButtonSend.setText(_translate("MainWindow", "Send", None))
+        self.labelFrom.setText(_translate("MainWindow", "BM-…", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
         self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
         self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui
index 742992ce..ea6fe9b1 100644
--- a/src/bitmessageqt/bitmessageui.ui
+++ b/src/bitmessageqt/bitmessageui.ui
@@ -192,165 +192,7 @@
         <string>Send</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Message:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QComboBox" name="comboBoxSendFrom">
-          <property name="minimumSize">
-           <size>
-            <width>300</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item row="13" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Subject:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QRadioButton" name="radioButtonSpecific">
-          <property name="text">
-           <string>Send to one or more specific people</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <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;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>From:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="15" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>297</height>
-           </size>
-          </property>
-         </spacer>
-        </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="13" column="1" colspan="3">
-         <widget class="QLineEdit" name="lineEditSubject">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <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="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">
+        <item row="12" column="4">
          <widget class="QPushButton" name="pushButtonFetchNamecoinID">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -374,7 +216,134 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="10" column="1" rowspan="2">
+        <item row="15" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Message:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="16" column="0">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>297</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="5" 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">
+           <string>From:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="14" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>Subject:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="2">
+         <widget class="QLineEdit" name="lineEditTo"/>
+        </item>
+        <item row="14" column="2" colspan="3">
+         <widget class="QLineEdit" name="lineEditSubject">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QComboBox" name="comboBoxSendFrom">
+          <property name="minimumSize">
+           <size>
+            <width>300</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="editable">
+           <bool>true</bool>
+          </property>
+          <property name="insertPolicy">
+           <enum>QComboBox::NoInsert</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QRadioButton" name="radioButtonSpecific">
+          <property name="text">
+           <string>Send to one or more specific people</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="4">
+         <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="17" column="2">
+         <widget class="QLabel" name="labelSendBroadcastWarning">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</string>
+          </property>
+          <property name="indent">
+           <number>-1</number>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QRadioButton" name="radioButtonBroadcast">
+          <property name="text">
+           <string>Broadcast to everyone who is subscribed to your address</string>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="2" rowspan="2">
          <widget class="QTableWidget" name="tableWidgetRecipients">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -430,22 +399,28 @@ p, li { white-space: pre-wrap; }
           </column>
          </widget>
         </item>
-        <item row="16" column="1">
-         <widget class="QLabel" name="labelSendBroadcastWarning">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+        <item row="15" column="2" 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;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
+         </widget>
+        </item>
+        <item row="17" column="4">
+         <widget class="QPushButton" name="pushButtonSend">
           <property name="text">
-           <string>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</string>
+           <string>Send</string>
           </property>
-          <property name="indent">
-           <number>-1</number>
+         </widget>
+        </item>
+        <item row="2" column="4">
+         <widget class="QLabel" name="labelFrom">
+          <property name="text">
+           <string>BM-…</string>
           </property>
          </widget>
         </item>
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index 409d7e55..8fe639e9 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: Mon Sep 09 19:01:31 2013
+# Created: Tue Sep 10 09:45:03 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!