From 5c8e736518922ae74ce08c9ae650c4faf9ec2d39 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 5 Jun 2018 14:24:54 +0200
Subject: [PATCH] fixed expanding messages

---
 src/widgets/helper/channelview.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/widgets/helper/channelview.cpp b/src/widgets/helper/channelview.cpp
index a34ba7339..9c0482ca6 100644
--- a/src/widgets/helper/channelview.cpp
+++ b/src/widgets/helper/channelview.cpp
@@ -1030,18 +1030,18 @@ void ChannelView::addContextMenuItems(const messages::MessageLayoutElement *hove
     }
 
     // Copy actions
-    menu->addAction("Copy selection",
-                    [this] { QGuiApplication::clipboard()->setText(this->getSelectedText()); });
-
     if (!this->selection.isEmpty()) {
-        menu->addAction("Copy message", [layout] {
-            QString copyString;
-            layout->addSelectionText(copyString);
-
-            QGuiApplication::clipboard()->setText(copyString);
-        });
+        menu->addAction("Copy selection",
+                        [this] { QGuiApplication::clipboard()->setText(this->getSelectedText()); });
     }
 
+    menu->addAction("Copy message", [layout] {
+        QString copyString;
+        layout->addSelectionText(copyString);
+
+        QGuiApplication::clipboard()->setText(copyString);
+    });
+
     //        menu->addAction("Quote message", [layout] {
     //            QString copyString;
     //            layout->addSelectionText(copyString);