diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index e114361833..7e13f195c5 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -125,7 +125,11 @@ void toast_callback(const LLSD& msg){
 
 	// check whether incoming IM belongs to an active session or not
 	if (LLIMModel::getInstance()->getActiveSessionID().notNull()
-			&& LLIMModel::getInstance()->getActiveSessionID() == msg["session_id"])
+	// <FS:Ansariel> Don't abort if we want to log in chat console and the IM floater has focus
+	//		&& LLIMModel::getInstance()->getActiveSessionID() == msg["session_id"])
+			&& LLIMModel::getInstance()->getActiveSessionID() == msg["session_id"]
+			 && !gSavedSettings.getBOOL("FSLogImToChatConsole"))
+	// </FS:Ansariel> Don't abort if we want to log in chat console and the IM floater has focus
 	{
 		return;
 	}
@@ -152,16 +156,20 @@ void toast_callback(const LLSD& msg){
 
 	// Skip toasting if we have open window of IM with this session id
 	LLIMFloater* open_im_floater = LLIMFloater::findInstance(msg["session_id"]);
+	// <FS:Ansariel> Don't abort if we want to log in chat console
+	//if (open_im_floater && open_im_floater->getVisible())
 	if (open_im_floater && open_im_floater->getVisible() && !gSavedSettings.getBOOL("FSLogImToChatConsole"))
+	// </FS:Ansariel> Don't abort if we want to log in chat console
 	{
 		return;
 	}
 
-	// Ansariel: Don't toast if the message is an announcement
+	// <FS:Ansariel> Don't toast if the message is an announcement
 	if (msg["is_announcement"].asBoolean())
 	{
 		return;
 	}
+	// </FS:Ansariel> Don't toast if the message is an announcement
 
 	LLAvatarNameCache::get(msg["from_id"].asUUID(),
 		boost::bind(&on_avatar_name_cache_toast,