diff --git a/src/chatlog/chatmessage.cpp b/src/chatlog/chatmessage.cpp
index 67eacc72b..a13199867 100644
--- a/src/chatlog/chatmessage.cpp
+++ b/src/chatlog/chatmessage.cpp
@@ -197,7 +197,7 @@ QString ChatMessage::detectQuotes(const QString& str)
     QString quotedText;
     for (int i=0;i<messageLines.size();++i)
     {
-        if (QRegExp("^[ ]*&gt;.*").exactMatch(messageLines[i]))
+        if (QRegExp("^&gt;( |&gt;|[^_\\d\\W]).*").exactMatch(messageLines[i]))
             quotedText += "<span class=quote>" + messageLines[i] + "</span>";
         else
             quotedText += messageLines[i];
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index a3e0b598e..c37daae6d 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -26,7 +26,6 @@
 #include "chatform.h"
 #include "src/core.h"
 #include "src/friend.h"
-#include "src/filetransferinstance.h"
 #include "src/historykeeper.h"
 #include "src/misc/style.h"
 #include "src/misc/settings.h"
@@ -34,16 +33,11 @@
 #include "src/widget/callconfirmwidget.h"
 #include "src/widget/friendwidget.h"
 #include "src/widget/netcamview.h"
-#include "src/widget/chatareawidget.h"
 #include "src/widget/form/loadhistorydialog.h"
 #include "src/widget/tool/chattextedit.h"
-#include "src/widget/tool/chatactions/filetransferaction.h"
 #include "src/widget/widget.h"
 #include "src/widget/maskablepixmapwidget.h"
 #include "src/widget/croppinglabel.h"
-#include "src/misc/style.h"
-#include "src/misc/settings.h"
-#include "src/misc/cstring.h"
 #include "src/chatlog/chatmessage.h"
 #include "src/chatlog/content/filetransferwidget.h"
 #include "src/chatlog/chatlinecontentproxy.h"