diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 9bb61177..35d64144 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -216,7 +216,7 @@ class singleListener(threading.Thread):
             #The following code will, unfortunately, block an incoming connection if someone else on the same LAN is already connected because the two computers will share the same external IP. This is here to prevent connection flooding.
             while HOST in shared.connectedHostsList:
                 shared.printLock.acquire()
-                print 'incoming connection is from a host in shared.connectedHostsList (we are already connected to it). Ignoring it.'
+                print 'We are already connected to', HOST+'. Ignoring connection.'
                 shared.printLock.release()
                 a.close()
                 a,(HOST,PORT) = sock.accept()
diff --git a/src/bitmessageui.py b/src/bitmessageui.py
index a7c85206..ca2d8b0b 100644
--- a/src/bitmessageui.py
+++ b/src/bitmessageui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Mon Apr 22 16:34:47 2013
+# Created: Tue May 21 14:09:58 2013
 #      by: PyQt4 UI code generator 4.9.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -428,6 +428,30 @@ class Ui_MainWindow(object):
         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.lineEditSubject, self.textEditMessage)
+        MainWindow.setTabOrder(self.textEditMessage, self.pushButtonSend)
+        MainWindow.setTabOrder(self.pushButtonSend, self.tableWidgetSent)
+        MainWindow.setTabOrder(self.tableWidgetSent, self.textEditSentMessage)
+        MainWindow.setTabOrder(self.textEditSentMessage, self.pushButtonNewAddress)
+        MainWindow.setTabOrder(self.pushButtonNewAddress, self.tableWidgetYourIdentities)
+        MainWindow.setTabOrder(self.tableWidgetYourIdentities, self.pushButtonAddSubscription)
+        MainWindow.setTabOrder(self.pushButtonAddSubscription, self.tableWidgetSubscriptions)
+        MainWindow.setTabOrder(self.tableWidgetSubscriptions, self.pushButtonAddAddressBook)
+        MainWindow.setTabOrder(self.pushButtonAddAddressBook, self.tableWidgetAddressBook)
+        MainWindow.setTabOrder(self.tableWidgetAddressBook, self.radioButtonBlacklist)
+        MainWindow.setTabOrder(self.radioButtonBlacklist, self.radioButtonWhitelist)
+        MainWindow.setTabOrder(self.radioButtonWhitelist, self.pushButtonAddBlacklist)
+        MainWindow.setTabOrder(self.pushButtonAddBlacklist, self.tableWidgetBlacklist)
+        MainWindow.setTabOrder(self.tableWidgetBlacklist, self.tableWidgetConnectionCount)
+        MainWindow.setTabOrder(self.tableWidgetConnectionCount, self.pushButtonStatusIcon)
 
     def retranslateUi(self, MainWindow):
         MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Bitmessage", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/src/bitmessageui.ui b/src/bitmessageui.ui
index cef8cd69..8487b673 100644
--- a/src/bitmessageui.ui
+++ b/src/bitmessageui.ui
@@ -1003,6 +1003,33 @@ p, li { white-space: pre-wrap; }
    </property>
   </action>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>tableWidgetInbox</tabstop>
+  <tabstop>textEditInboxMessage</tabstop>
+  <tabstop>radioButtonSpecific</tabstop>
+  <tabstop>radioButtonBroadcast</tabstop>
+  <tabstop>comboBoxSendFrom</tabstop>
+  <tabstop>lineEditTo</tabstop>
+  <tabstop>pushButtonLoadFromAddressBook</tabstop>
+  <tabstop>lineEditSubject</tabstop>
+  <tabstop>textEditMessage</tabstop>
+  <tabstop>pushButtonSend</tabstop>
+  <tabstop>tableWidgetSent</tabstop>
+  <tabstop>textEditSentMessage</tabstop>
+  <tabstop>pushButtonNewAddress</tabstop>
+  <tabstop>tableWidgetYourIdentities</tabstop>
+  <tabstop>pushButtonAddSubscription</tabstop>
+  <tabstop>tableWidgetSubscriptions</tabstop>
+  <tabstop>pushButtonAddAddressBook</tabstop>
+  <tabstop>tableWidgetAddressBook</tabstop>
+  <tabstop>radioButtonBlacklist</tabstop>
+  <tabstop>radioButtonWhitelist</tabstop>
+  <tabstop>pushButtonAddBlacklist</tabstop>
+  <tabstop>tableWidgetBlacklist</tabstop>
+  <tabstop>tableWidgetConnectionCount</tabstop>
+  <tabstop>pushButtonStatusIcon</tabstop>
+ </tabstops>
  <resources>
   <include location="bitmessage_icons.qrc"/>
  </resources>