diff --git a/src/jamichatview/qml/textbubble.qml b/src/jamichatview/qml/textbubble.qml
index a0a7a229..6be0a2e3 100644
--- a/src/jamichatview/qml/textbubble.qml
+++ b/src/jamichatview/qml/textbubble.qml
@@ -1,177 +1,185 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                   *
  *                                                                         *
  *   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 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   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.7
 import QtQuick.Layouts 1.2
 
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.ringkde.jamicontactview 1.0 as JamiContactView
 import org.kde.ringkde.jamichatview 1.0 as JamiChatView
 
 Item {
     id: chatMessage
     width: parent.width
 
     property color background
     property color foreground
     property var cm: contactMethod
     signal clicked()
 
     Behavior on background {
         ColorAnimation {duration: 300; easing.type: Easing.InQuad}
     }
 
     height: bubble.height + 10
 
     function getFactor() {
         return (height > (chatMessage.width*0.5)) ? 0.9 : 0.7
     }
 
     // Prevent a binding loop. the "current" height isn't required anyway
     onWidthChanged: {
         bubble.maximumWidth = chatMessage.width*getFactor()
     }
 
     RowLayout {
         anchors.fill: parent
 
         JamiContactView.ContactPhoto {
             width: 50
             height: 50
             visible: direction == 0
             drawEmptyOutline: false
             tracked: false
             contactMethod: chatMessage.cm
             Layout.alignment: Qt.AlignBottom
             Layout.bottomMargin: 20
             defaultColor: Kirigami.Theme.textColor
         }
 
         Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
             JamiChatView.Bubble {
                 id: bubble
                 anchors.margins: 5
                 sideMargins: 30
                 anchors.right: direction == 1 ? parent.right : undefined
                 anchors.left : direction == 1 ? undefined : parent.left
                 font.pointSize: Kirigami.Theme.defaultFont.pointSize*1.2
                 font.family: "Noto Color Emoji"
                 dateFont: dateLabel.font
                 z: 1
 
                 alignment: direction == 1 ? Text.AlignRight : Text.AlignLeft
                 color: background
 
                 text: display != undefined ? display : "N/A"
                 height: Math.max(50, label.implicitHeight + dateLabel.implicitHeight + 5)
 
                 Text {
                     id: label
                     width: parent.width
                     anchors.leftMargin: bubble.sideMargins
                     anchors.rightMargin: bubble.sideMargins
                     anchors.topMargin: 5
                     anchors.bottomMargin: 5
                     anchors.verticalCenter: bubble.verticalCenter
                     anchors.left: direction == 1 ? undefined : bubble.left
                     anchors.right: direction == 1 ? bubble.right : undefined
                     horizontalAlignment: direction == 1 ? Text.AlignRight : Text.AlignLeft
                     font: bubble.font
                     text: display != undefined ? display : "N/A"
                     color: foreground
                     wrapMode: Text.WordWrap
 
                     transitions: Transition {
                         AnchorAnimation {duration: 200;  easing.type: Easing.OutQuad }
                     }
 
                     states: [
                         State {
                             name: ""
                             when: !chatView.displayExtraTime
                             AnchorChanges {
                                 target: label
                                 anchors.verticalCenter: bubble.verticalCenter
                                 anchors.top: undefined
                             }
 
                             PropertyChanges {
                                 target: label
                                 anchors.topMargin: 5
                                 anchors.bottomMargin: 5
                             }
                         },
                         State {
                             name: "showtime"
                             when: chatView.displayExtraTime
                             AnchorChanges {
                                 target: label
                                 anchors.verticalCenter: undefined
                                 anchors.top: bubble.top
                             }
 
                             PropertyChanges {
                                 target: label
                                 anchors.topMargin: 0
                                 anchors.bottomMargin: 0
                             }
                         }
                     ]
                 }
 
                 Text {
                     id: dateLabel
                     anchors.bottom: parent.bottom
                     anchors.left: direction == 1 ? parent.left : undefined
                     anchors.right: direction == 0 ? parent.right : undefined
                     anchors.bottomMargin: 4
                     anchors.leftMargin: direction == 1 ? 4 : undefined
                     anchors.rightMargin: direction == 0 ? 4 : undefined
                     text: formattedDate != undefined ? formattedDate : "N/A"
                     color: Kirigami.Theme.highlightedTextColor
                     opacity: chatView.displayExtraTime ? 0.75 : 0
 
                     Behavior on opacity {
                         NumberAnimation {duration: 200}
                     }
                 }
 
                 MouseArea {
                     anchors.fill: parent
+
+                    /**
+                     * On mobile, there is already multiple layers of touch
+                     * capable controls and this confuses the input handling
+                     * code too much.
+                     */
+                    enabled: !Kirigami.Settings.isMobile
+
                     onClicked: {
                         chatMessage.clicked()
                     }
                 }
             }
         }
 
         JamiContactView.ContactPhoto {
             width: 50
             height: 50
             visible: direction == 1
             drawEmptyOutline: false
             tracked: false
             contactMethod: chatMessage.cm
             Layout.alignment: Qt.AlignBottom
             Layout.bottomMargin: 20
             defaultColor: Kirigami.Theme.textColor
         }
     }
 }