diff --git a/src/conversation.cpp b/src/conversation.cpp
index 95f601a9a0afa7dc80204e86a057f11b03457ba1..f6b316b80c19fbfb2547d6e816032123b3f4b1bc 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -82,14 +82,14 @@ void Conversation::handleMessage(boost::shared_ptr<Swift::Message> &message, con
 		message->setType(Swift::Message::Groupchat);
 	}
 	else {
-		if (message->getType() != Swift::Message::Headline) {
-			if (m_conversationManager->getUser()->getUserSetting("send_headlines") == "1") {
-				message->setType(Swift::Message::Headline);
-			}
-			else {
+		if (message->getType() == Swift::Message::Headline) {
+			if (m_conversationManager->getUser()->getUserSetting("send_headlines") != "1") {
 				message->setType(Swift::Message::Chat);
 			}
 		}
+		else {
+			message->setType(Swift::Message::Chat);
+		}
 	}
 
 	std::string n = nickname;