diff --git a/include/znc/Modules.h b/include/znc/Modules.h
index b8d5f71e..852e5157 100644
--- a/include/znc/Modules.h
+++ b/include/znc/Modules.h
@@ -805,7 +805,6 @@ class CModule {
 
     /** This module hook is called when a client sends a raw traffic line to ZNC.
      *  @param sLine The raw traffic line sent.
-     *  @note The line does not include message tags. Use OnUserRawMessage() to access them.
      *  @return See CModule::EModRet.
      */
     virtual EModRet OnUserRaw(CString& sLine);
diff --git a/src/Client.cpp b/src/Client.cpp
index a15fc2a0..9ef4b984 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -115,12 +115,6 @@ void CClient::ReadLine(const CString& sData) {
     DEBUG("(" << GetFullName() << ") CLI -> ZNC ["
         << CDebug::Filter(sLine) << "]");
 
-    MCString mssTags;
-    if (sLine.StartsWith("@")) {
-        mssTags = CUtils::GetMessageTags(sLine);
-        sLine = sLine.Token(1, true);
-    }
-
     bool bReturn = false;
     if (IsAttached()) {
         NETWORKMODULECALL(OnUserRaw(sLine), m_pUser, m_pNetwork, this,
@@ -132,7 +126,6 @@ void CClient::ReadLine(const CString& sData) {
 
     CMessage Message(sLine);
     Message.SetClient(this);
-    Message.SetTags(mssTags);
 
     if (IsAttached()) {
         NETWORKMODULECALL(OnUserRawMessage(Message), m_pUser, m_pNetwork, this,