diff --git a/backends/libcommuni/ircnetworkplugin.cpp b/backends/libcommuni/ircnetworkplugin.cpp
index 4996a874558f3bfe6f918f9e0c66e902b21930c2..85182c67608944c30ff94156a96422b8532884ad 100644
--- a/backends/libcommuni/ircnetworkplugin.cpp
+++ b/backends/libcommuni/ircnetworkplugin.cpp
@@ -153,6 +153,9 @@ void IRCNetworkPlugin::handleMessageSendRequest(const std::string &user, const s
 	}
 
 	std::string target = getTargetName(legacyName);
+	if (legacyName.find("/") != std::string::npos) {
+		m_sessions[session]->addPM(target, legacyName.substr(0, legacyName.find("@")));
+	}
 
 	LOG4CXX_INFO(logger, user << ": Session name: " << session << ", message to " << target);