diff --git a/src/snippets/ui/snippetwidget.ui b/src/snippets/ui/snippetwidget.ui
index 25acfea..e81fb93 100644
--- a/src/snippets/ui/snippetwidget.ui
+++ b/src/snippets/ui/snippetwidget.ui
@@ -1,271 +1,270 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SnippetWidget</class>
  <widget class="QWidget" name="SnippetWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>549</width>
-    <height>467</height>
+    <height>638</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QFormLayout" name="formLayout_2">
      <item row="0" column="0">
       <widget class="QLabel" name="nameLabel">
        <property name="text">
         <string>&amp;Name:</string>
        </property>
        <property name="wordWrap">
         <bool>false</bool>
        </property>
        <property name="buddy">
         <cstring>nameEdit</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="KLineEdit" name="nameEdit"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QWidget" name="groupWidget" native="true">
      <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="1" colspan="2">
-       <widget class="KLineEdit" name="subject">
-        <property name="clearButtonEnabled">
-         <bool>true</bool>
+      <item row="1" column="0">
+       <widget class="QLabel" name="textLabelGroup">
+        <property name="text">
+         <string comment="Group to which the snippet belongs.">Group:</string>
         </property>
-        <property name="urlDropsEnabled">
+        <property name="wordWrap">
          <bool>false</bool>
         </property>
-        <property name="trapEnterKeyEvent" stdset="0">
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="11" column="0">
-       <widget class="QLabel" name="label">
+      <item row="1" column="1" colspan="2">
+       <widget class="QComboBox" name="groupBox"/>
+      </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="label_6">
         <property name="text">
-         <string>Keyword:</string>
+         <string>Attachment:</string>
         </property>
        </widget>
       </item>
-      <item row="8" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>347</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>To:</string>
+      <item row="6" column="1" colspan="2">
+       <widget class="KPIMTextEdit::PlainTextEditorWidget" name="snippetText">
+        <property name="font">
+         <font>
+          <family>Courier</family>
+          <pointsize>11</pointsize>
+         </font>
         </property>
        </widget>
       </item>
-      <item row="12" column="0">
-       <widget class="QLabel" name="keyWidgetLabel">
+      <item row="6" column="0">
+       <widget class="QLabel" name="textLabel">
         <property name="text">
-         <string>Sho&amp;rtcut:</string>
+         <string>&amp;Snippet:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignTop</set>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
-         <cstring>keyWidget</cstring>
+         <cstring>snippetText</cstring>
         </property>
        </widget>
       </item>
-      <item row="12" column="1" colspan="2">
-       <widget class="KKeySequenceWidget" name="keyWidget">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="4" column="1" colspan="2">
+       <widget class="QLineEdit" name="cc">
+        <property name="placeholderText">
+         <string>Separate email with a comma</string>
+        </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="6" column="1" colspan="2">
-       <widget class="KPIMTextEdit::PlainTextEditorWidget" name="snippetText">
-        <property name="font">
-         <font>
-          <family>Courier</family>
-          <pointsize>11</pointsize>
-         </font>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>To:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="QLineEdit" name="cc">
+      <item row="5" column="1" colspan="2">
+       <widget class="QLineEdit" name="bcc">
         <property name="placeholderText">
          <string>Separate email with a comma</string>
         </property>
         <property name="clearButtonEnabled">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_5">
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Bcc:</string>
+         <string>Cc:</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="textLabel">
+      <item row="13" column="0">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>&amp;Snippet:</string>
+         <string>Keyword:</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignTop</set>
+       </widget>
+      </item>
+      <item row="14" column="0">
+       <widget class="QLabel" name="keyWidgetLabel">
+        <property name="text">
+         <string>Sho&amp;rtcut:</string>
         </property>
         <property name="wordWrap">
          <bool>false</bool>
         </property>
         <property name="buddy">
-         <cstring>snippetText</cstring>
+         <cstring>keyWidget</cstring>
         </property>
        </widget>
       </item>
       <item row="3" column="1" colspan="2">
        <widget class="QLineEdit" name="to">
         <property name="placeholderText">
          <string>Separate email with a comma</string>
         </property>
         <property name="clearButtonEnabled">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="11" column="1" colspan="2">
-       <widget class="KLineEdit" name="keyword">
+      <item row="2" column="1" colspan="2">
+       <widget class="KLineEdit" name="subject">
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
         <property name="urlDropsEnabled">
          <bool>false</bool>
         </property>
         <property name="trapEnterKeyEvent" stdset="0">
          <bool>true</bool>
         </property>
-        <property name="showClearButton" stdset="0">
-         <bool>true</bool>
-        </property>
        </widget>
       </item>
-      <item row="8" column="1">
-       <widget class="QPushButton" name="pushButtonVariables">
-        <property name="text">
-         <string>Variables</string>
+      <item row="14" column="1" colspan="2">
+       <widget class="KKeySequenceWidget" name="keyWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>Subject:</string>
+         <string>Bcc:</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="QLineEdit" name="bcc">
-        <property name="placeholderText">
-         <string>Separate email with a comma</string>
+      <item row="9" column="1" colspan="2">
+       <widget class="MailCommon::SnippetAttachmentWidget" name="attachment" native="true"/>
+      </item>
+      <item row="13" column="1" colspan="2">
+       <widget class="KLineEdit" name="keyword">
+        <property name="urlDropsEnabled">
+         <bool>false</bool>
         </property>
-        <property name="clearButtonEnabled">
+        <property name="trapEnterKeyEvent" stdset="0">
          <bool>true</bool>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="textLabelGroup">
-        <property name="text">
-         <string comment="Group to which the snippet belongs.">Group:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
+        <property name="showClearButton" stdset="0">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_4">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Cc:</string>
+         <string>Subject:</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="QComboBox" name="groupBox"/>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_6">
+      <item row="7" column="1">
+       <widget class="QPushButton" name="pushButtonVariables">
         <property name="text">
-         <string>Attachment:</string>
+         <string>Variables</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="1" colspan="2">
-       <widget class="MailCommon::SnippetAttachmentWidget" name="attachment"/>
+      <item row="7" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>347</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>MailCommon::SnippetAttachmentWidget</class>
-   <extends>QWidget</extends>
-   <header>snippets/snippetattachmentwidget.h</header>
-  </customwidget>	  
   <customwidget>
    <class>KPIMTextEdit::PlainTextEditorWidget</class>
    <extends>QWidget</extends>
    <header>kpimtextedit/plaintexteditorwidget.h</header>
   </customwidget>
   <customwidget>
    <class>KKeySequenceWidget</class>
    <extends>QWidget</extends>
    <header>kkeysequencewidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>MailCommon::SnippetAttachmentWidget</class>
+   <extends>QWidget</extends>
+   <header>snippets/snippetattachmentwidget.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>nameEdit</tabstop>
   <tabstop>groupBox</tabstop>
   <tabstop>subject</tabstop>
   <tabstop>to</tabstop>
   <tabstop>cc</tabstop>
   <tabstop>bcc</tabstop>
-  <tabstop>pushButtonVariables</tabstop>
   <tabstop>keyword</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>