diff --git a/src/qml/MessageLine.qml b/src/qml/MessageLine.qml
index 843357fb..a9fa7a7c 100644
--- a/src/qml/MessageLine.qml
+++ b/src/qml/MessageLine.qml
@@ -1,143 +1,147 @@
 /*
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  * Copyright (C) 2017-2018 Laurent Montel <montel@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 
 import QtQuick 2.9
 import QtQuick.Controls 1.4
 import QtQuick.Controls 2.2 as QQC2
 import QtQuick.Layouts 1.1
 
 import KDE.Ruqola.RocketChatAccount 1.0
 import KDE.Ruqola.InputCompleterModel 1.0
 import KDE.Ruqola.DDPClient 1.0
 import org.kde.kirigami 2.1 as Kirigami
 
 ColumnLayout {
     property alias messageLineText: messageLine.text
     property string savePreviousMessage
     readonly property int popupheight: 100
     function setOriginalMessage(messageStr)
     {
         messageLine.text = messageStr
         savePreviousMessage = messageStr
         messageLine.selectAll()
     }
 
     TextField {
         id: messageLine
         //TODO add background style.
         //FIXME add multiline !!!
         inputMethodHints: Qt.ImhMultiLine
 
         Layout.fillWidth: true
         placeholderText: i18n("Enter Message...")
         onTextChanged: {
             rcAccount.setInputTextChanged(text, cursorPosition);
             if (listView.count > 0) {
                 showPopupCompleting()
             } else {
                 popup.close()
             }
             footerItem.textEditing(text)
         }
+        Keys.onDownPressed: {
+            listView.incrementCurrentIndex()
+        }
+        Keys.onUpPressed: {
+            listView.decrementCurrentIndex()
+        }
+        Keys.onTabPressed: {
+            textSelected(listView.currentItem.myData.completername)
+        }
         onAccepted: {
             if (text != "" && rcAccount.loginStatus === DDPClient.LoggedIn && (selectedRoomID !== "")) {
                 if (messageId !== "") {
                     if (text !== savePreviousMessage) {
                         rcAccount.updateMessage(selectedRoomID, messageId, text);
                     }
                     savePreviousMessage = "";
                     messageId = "";
                 } else {
                     rcAccount.sendMessage(selectedRoomID, text);
                 }
                 text = "";
             }
         }
         QQC2.Popup {
             id: popup
             x: 0
             y: -popupheight
             padding: 0
             width: messageLine.width
             contentHeight: rect.height
             visible: listView.count > 0
 
             Rectangle {
                 id: rect
 
                 anchors.top: popup.top
                 anchors.left: popup.left
 
                 height: popupheight
                 width: popup.width
 
                 ListView {
                     id: listView
                     height: popupheight
                     width: parent.width
                     interactive: true
                     clip: true
                     model: rcAccount.inputCompleterModel()
                     delegate: Kirigami.BasicListItem {
+                        readonly property variant myData: model
+
                         icon: model.iconname
 
                         label: model.displayname
                         onClicked: {
                             listView.currentIndex = model.index
                             textSelected(model.completername)
                         }
                         highlighted: focus && ListView.isCurrentItem
                     }
                     QQC2.ScrollIndicator.vertical: QQC2.ScrollIndicator { }
                 }
             }
         }
         function showPopupCompleting() {
             if (!popup.visible) {
                 popup.open()
-                listView.currentIndex = -1
+                listView.currentIndex = 0
             }
         }
     }
 
-    function textSelected(completer) {
+    function textSelected(completerName) {
         if (listView.currentItem) {
-            messageLine.text = rcAccount.replaceWord(completer, messageLine.text, messageLine.cursorPosition)
+            messageLine.text = rcAccount.replaceWord(completerName + " ", messageLine.text, messageLine.cursorPosition)
         }
         popup.close()
     }
     Keys.onEscapePressed: {
         if (popup.visible) {
             popup.close()
         } else {
             clearUnreadMessages();
         }
     }
-
-    Keys.onDownPressed: {
-        listView.incrementCurrentIndex()
-    }
-    Keys.onUpPressed: {
-        listView.decrementCurrentIndex()
-    }
 }