diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index d3d250326..ced665691 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -951,8 +951,6 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /*= ""*/)
         }
 
         msgComposer->ui.msgText->document()->setModified(false);
-    } else {
-        msgComposer->insertTitleText(tr("No Title"));
     }
 
     msgComposer->calculateTitle();
@@ -1130,6 +1128,7 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
     /* check for existing title */
     if (bDraftbox == false && mi.title.empty()) {
         if (QMessageBox::warning(this, tr("RetroShare"), tr("Do you want to send the message without a subject ?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
+            ui.titleEdit->setFocus();
             return false; // Don't send with an empty subject
         }
     }
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui
index d8d117dba..ede171600 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.ui
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>796</width>
-    <height>564</height>
+    <height>588</height>
    </rect>
   </property>
   <property name="contextMenuPolicy">
@@ -17,7 +17,7 @@
    <string>Compose</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../images.qrc">
     <normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
   </property>
   <property name="styleSheet">
@@ -108,6 +108,9 @@
                <family>MS Shell Dlg 2</family>
               </font>
              </property>
+             <property name="focusPolicy">
+              <enum>Qt::NoFocus</enum>
+             </property>
              <property name="toolTip">
               <string>Reset</string>
              </property>
@@ -299,6 +302,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>16777215</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::ClickFocus</enum>
+                </property>
                 <item>
                  <property name="text">
                   <string>Paragraph</string>
@@ -349,6 +355,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>16777215</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::ClickFocus</enum>
+                </property>
                </widget>
               </item>
               <item row="0" column="2">
@@ -359,6 +368,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>16777215</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::ClickFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Font size</string>
                 </property>
@@ -372,6 +384,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>1677</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Increase font size</string>
                 </property>
@@ -379,7 +394,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/textedit/format_font_size_more.png</normaloff>:/images/textedit/format_font_size_more.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -401,6 +416,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>167</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Decrease font size</string>
                 </property>
@@ -408,7 +426,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/textedit/format_font_size_less.png</normaloff>:/images/textedit/format_font_size_less.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -436,6 +454,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>1677</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Bold</string>
                 </property>
@@ -443,7 +464,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/textedit/textbold.png</normaloff>:/images/textedit/textbold.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -460,44 +481,6 @@ border: 1px solid #CCCCCC;}</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="7">
-               <widget class="QToolButton" name="underlinebtn">
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-                <property name="maximumSize">
-                 <size>
-                  <width>167</width>
-                  <height>167</height>
-                 </size>
-                </property>
-                <property name="toolTip">
-                 <string>Underline</string>
-                </property>
-                <property name="text">
-                 <string/>
-                </property>
-                <property name="icon">
-                 <iconset>
-                  <normaloff>:/images/textedit/textunder.png</normaloff>:/images/textedit/textunder.png</iconset>
-                </property>
-                <property name="iconSize">
-                 <size>
-                  <width>24</width>
-                  <height>24</height>
-                 </size>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-                <property name="autoRaise">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
               <item row="0" column="8">
                <widget class="QToolButton" name="italicbtn">
                 <property name="minimumSize">
@@ -512,6 +495,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>167</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Italic</string>
                 </property>
@@ -519,7 +505,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/textedit/textitalic.png</normaloff>:/images/textedit/textitalic.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -550,6 +536,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>167</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Select Color</string>
                 </property>
@@ -575,6 +564,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>167</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Alignment</string>
                 </property>
@@ -609,6 +601,9 @@ border: 1px solid #CCCCCC;}</string>
                   <height>167</height>
                  </size>
                 </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Add a Image</string>
                 </property>
@@ -616,7 +611,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -632,6 +627,9 @@ border: 1px solid #CCCCCC;}</string>
               </item>
               <item row="0" column="9">
                <widget class="QToolButton" name="codeButton">
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="toolTip">
                  <string>Sets text font to code style</string>
                 </property>
@@ -639,7 +637,7 @@ border: 1px solid #CCCCCC;}</string>
                  <string/>
                 </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/textedit/hi22-action-format-text-code.png</normaloff>:/images/textedit/hi22-action-format-text-code.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -668,8 +666,11 @@ border: 1px solid #CCCCCC;}</string>
               </item>
               <item row="0" column="3">
                <widget class="QToolButton" name="emoticonButton">
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
                 <property name="icon">
-                 <iconset>
+                 <iconset resource="../images.qrc">
                   <normaloff>:/images/emoticons/kopete/kopete020.png</normaloff>:/images/emoticons/kopete/kopete020.png</iconset>
                 </property>
                 <property name="iconSize">
@@ -683,6 +684,47 @@ border: 1px solid #CCCCCC;}</string>
                 </property>
                </widget>
               </item>
+              <item row="0" column="7">
+               <widget class="QToolButton" name="underlinebtn">
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>167</width>
+                  <height>167</height>
+                 </size>
+                </property>
+                <property name="focusPolicy">
+                 <enum>Qt::NoFocus</enum>
+                </property>
+                <property name="toolTip">
+                 <string>Underline</string>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../images.qrc">
+                  <normaloff>:/images/textedit/textunder.png</normaloff>:/images/textedit/textunder.png</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>24</width>
+                  <height>24</height>
+                 </size>
+                </property>
+                <property name="checkable">
+                 <bool>true</bool>
+                </property>
+                <property name="autoRaise">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
              </layout>
             </item>
            </layout>
@@ -751,6 +793,9 @@ border: 1px solid #CCCCCC;}</string>
              <height>68</height>
             </size>
            </property>
+           <property name="tabKeyNavigation">
+            <bool>false</bool>
+           </property>
            <property name="selectionMode">
             <enum>QAbstractItemView::SingleSelection</enum>
            </property>
@@ -919,7 +964,7 @@ border: 1px solid #CCCCCC;}</string>
   </widget>
   <action name="actionSend">
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/send24.png</normaloff>:/images/send24.png</iconset>
    </property>
    <property name="text">
@@ -931,7 +976,7 @@ border: 1px solid #CCCCCC;}</string>
   </action>
   <action name="actionReply">
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/replymail24.png</normaloff>:/images/replymail24.png</iconset>
    </property>
    <property name="text">
@@ -940,7 +985,7 @@ border: 1px solid #CCCCCC;}</string>
   </action>
   <action name="actionContactsView">
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/contacts24.png</normaloff>:/images/contacts24.png</iconset>
    </property>
    <property name="text">
@@ -952,7 +997,7 @@ border: 1px solid #CCCCCC;}</string>
   </action>
   <action name="actionSaveas">
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/save24.png</normaloff>:/images/save24.png</iconset>
    </property>
    <property name="text">
@@ -964,7 +1009,7 @@ border: 1px solid #CCCCCC;}</string>
   </action>
   <action name="actionAttach">
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/attach.png</normaloff>:/images/attach.png</iconset>
    </property>
    <property name="text">
@@ -979,7 +1024,7 @@ border: 1px solid #CCCCCC;}</string>
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../images.qrc">
      <normaloff>:/images/quote_24.png</normaloff>:/images/quote_24.png</iconset>
    </property>
    <property name="text">
@@ -991,10 +1036,23 @@ border: 1px solid #CCCCCC;}</string>
   </action>
  </widget>
  <tabstops>
-  <tabstop>msgSendList</tabstop>
+  <tabstop>recipientWidget</tabstop>
+  <tabstop>titleEdit</tabstop>
   <tabstop>msgText</tabstop>
   <tabstop>msgFileList</tabstop>
+  <tabstop>filterPatternLineEdit</tabstop>
+  <tabstop>msgSendList</tabstop>
+  <tabstop>addToButton</tabstop>
+  <tabstop>addCcButton</tabstop>
+  <tabstop>addBccButton</tabstop>
+  <tabstop>addRecommendButton</tabstop>
+  <tabstop>comboSize</tabstop>
+  <tabstop>comboStyle</tabstop>
+  <tabstop>comboFont</tabstop>
+  <tabstop>hashBox</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../images.qrc"/>
+ </resources>
  <connections/>
 </ui>