group chats:

- massive extinction of all remaining GC_* messages;
- color chooser completely moved to mir_app;
- color buttons' subclass function also moved to mir_app;
- all code management transferred to a bunch of virtual functions, members of CChatRoomDlg;
- numerous small fixes, like fix for a broken highlight in StdMsg

14 files changed, 384 insertions, 316 deletions

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index c0e881954d..bd9d3cacb8 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -88,7 +88,7 @@ static void OnReplaceSession(SESSION_INFO *si)
 static void OnNewUser(SESSION_INFO *si, USERINFO*)
 {
 	if (si->pDlg)
-		SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);
+		si->pDlg->UpdateNickList();
 }
 
 static void OnFlashHighlight(SESSION_INFO *si, int bInactive)
@@ -99,7 +99,7 @@ static void OnFlashHighlight(SESSION_INFO *si, int bInactive)
 	if (!g_Settings.bTabsEnable && si->pDlg && g_Settings.bFlashWindowHighlight)
 		SetTimer(si->pDlg->GetHwnd(), TIMERID_FLASHWND, 900, NULL);
 	if (g_Settings.bTabsEnable && si->pDlg)
-		SendMessage(si->pDlg->GetHwnd(), GC_SETMESSAGEHIGHLIGHT, 0, (LPARAM)si->pDlg);
+		pDialog->SetMessageHighlight(si->pDlg);
 }
 
 static void OnFlashWindow(SESSION_INFO *si, int bInactive)
@@ -110,7 +110,7 @@ static void OnFlashWindow(SESSION_INFO *si, int bInactive)
 	if (!g_Settings.bTabsEnable && si->pDlg && g_Settings.bFlashWindow)
 		SetTimer(si->pDlg->GetHwnd(), TIMERID_FLASHWND, 900, NULL);
 	if (g_Settings.bTabsEnable && si->pDlg)
-		SendMessage(si->pDlg->GetHwnd(), GC_SETTABHIGHLIGHT, 0, (LPARAM)si->pDlg);
+		pDialog->SetTabHighlight(si->pDlg);
 }
 
 static BOOL DoTrayIcon(SESSION_INFO *si, GCEVENT *gce)
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index 13b6d7f0af..b5a75b4241 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -433,7 +433,7 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM, LPARAM
 					pci->SM_BroadcastMessage(NULL, WM_CLOSE, 0, 1, FALSE);
 					g_Settings.bTabsEnable = db_get_b(NULL, CHAT_MODULE, "Tabs", 1) != 0;
 				}
-				else pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE);
+				else Chat_UpdateOptions();
 
 				return TRUE;
 			}
@@ -641,7 +641,7 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 				db_unset(NULL, CHAT_MODULE, "NicklistRowDist");
 
 			pci->ReloadSettings();
-			pci->SM_BroadcastMessage(NULL, GC_SETWNDPROPS, 0, 0, TRUE);
+			Chat_UpdateOptions();
 			return TRUE;
 		}
 		break;
diff --git a/src/core/stdmsg/src/chat_util.cpp b/src/core/stdmsg/src/chat_util.cpp
index f4d514d635..d163e2e83a 100644
--- a/src/core/stdmsg/src/chat_util.cpp
+++ b/src/core/stdmsg/src/chat_util.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-void CChatRoomDlg::Log_StreamInEvent(LOGINFO *lin, BOOL bRedraw)
+void CChatRoomDlg::StreamInEvents(LOGINFO *lin, bool bRedraw)
 {
 	if (m_hwnd == nullptr || lin == nullptr || m_si == nullptr)
 		return;
@@ -102,7 +102,7 @@ void CChatRoomDlg::Log_StreamInEvent(LOGINFO *lin, BOOL bRedraw)
 
 	// scroll log to bottom if the log was previously scrolled to bottom, else restore old position
 	if (bRedraw || (UINT)scroll.nPos >= (UINT)scroll.nMax - scroll.nPage - 5 || scroll.nMax - scroll.nMin - scroll.nPage < 50)
-		SendMessage(GetParent(m_log.GetHwnd()), GC_SCROLLTOBOTTOM, 0, 0);
+		ScrollToBottom();
 	else
 		SendMessage(m_log.GetHwnd(), EM_SETSCROLLPOS, 0, (LPARAM)&point);
 
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index d96426e630..dda13a4b78 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -617,7 +617,7 @@ INT_PTR CALLBACK CChatRoomDlg::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 
 			pDlg->m_iLogFilterFlags = iFlags;
 			if (pDlg->m_bFilterEnabled)
-				SendMessage(GetParent(hwndDlg), GC_REDRAWLOG, 0, 0);
+				pDlg->RedrawLog();
 			PostMessage(hwndDlg, WM_CLOSE, 0, 0);
 		}
 		break;
@@ -630,24 +630,6 @@ INT_PTR CALLBACK CChatRoomDlg::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 	return(FALSE);
 }
 
-static LRESULT CALLBACK ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch (msg) {
-	case WM_RBUTTONUP:
-		if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) != 0) {
-			if (GetDlgItem(GetParent(hwnd), IDC_FILTER) == hwnd)
-				SendMessage(GetParent(hwnd), GC_SHOWFILTERMENU, 0, 0);
-			if (GetDlgItem(GetParent(hwnd), IDC_COLOR) == hwnd)
-				SendMessage(GetParent(hwnd), GC_SHOWCOLORCHOOSER, 0, IDC_COLOR);
-			if (GetDlgItem(GetParent(hwnd), IDC_BKGCOLOR) == hwnd)
-				SendMessage(GetParent(hwnd), GC_SHOWCOLORCHOOSER, 0, IDC_BKGCOLOR);
-		}
-		break;
-	}
-
-	return mir_callNextSubclass(hwnd, ButtonSubclassProc, msg, wParam, lParam);
-}
-
 static LRESULT CALLBACK LogSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	CHARRANGE sel;
@@ -824,7 +806,7 @@ static void __cdecl phase2(void * lParam)
 	SESSION_INFO *si = (SESSION_INFO*)lParam;
 	Sleep(30);
 	if (si && si->pDlg)
-		PostMessage(si->pDlg->GetHwnd(), GC_REDRAWLOG2, 0, 0);
+		si->pDlg->RedrawLog2();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -854,6 +836,9 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) :
 {
 	m_pLog = &m_log;
 	m_pEntry = &m_message;
+	m_pColor = &m_btnColor;
+	m_pBkColor = &m_btnBkColor;
+	m_pFilter = &m_btnFilter;
 
 	m_autoClose = 0;
 	m_forceResizable = true;
@@ -896,9 +881,10 @@ void CChatRoomDlg::OnInitDialog()
 
 	NotifyLocalWinEvent(m_hContact, m_hwnd, MSG_WINDOW_EVT_OPENING);
 
-	mir_subclassWindow(m_btnFilter.GetHwnd(), ButtonSubclassProc);
-	mir_subclassWindow(m_btnColor.GetHwnd(), ButtonSubclassProc);
-	mir_subclassWindow(m_btnBkColor.GetHwnd(), ButtonSubclassProc);
+	mir_subclassWindow(m_btnFilter.GetHwnd(), Srmm_ButtonSubclassProc);
+	mir_subclassWindow(m_btnColor.GetHwnd(), Srmm_ButtonSubclassProc);
+	mir_subclassWindow(m_btnBkColor.GetHwnd(), Srmm_ButtonSubclassProc);
+
 	mir_subclassWindow(m_message.GetHwnd(), MessageSubclassProc);
 
 	SetWindowLongPtr(m_log.GetHwnd(), GWLP_USERDATA, LPARAM(this));
@@ -907,7 +893,7 @@ void CChatRoomDlg::OnInitDialog()
 	SetWindowLongPtr(m_nickList.GetHwnd(), GWLP_USERDATA, LPARAM(m_si));
 	mir_subclassWindow(m_nickList.GetHwnd(), NicklistSubclassProc);
 
-	SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SUBCLASSED, 0, LPARAM(m_si));
+	m_message.SendMsg(EM_SUBCLASSED, 0, LPARAM(m_si));
 	SendDlgItemMessage(m_hwnd, IDC_LOG, EM_AUTOURLDETECT, 1, 0);
 
 	int mask = (int)SendDlgItemMessage(m_hwnd, IDC_LOG, EM_GETEVENTMASK, 0, 0);
@@ -924,8 +910,8 @@ void CChatRoomDlg::OnInitDialog()
 
 	SendDlgItemMessage(m_hwnd, IDC_LOG, EM_HIDESELECTION, TRUE, 0);
 
-	SendMessage(m_hwnd, GC_SETWNDPROPS, 0, 0);
-	SendMessage(m_hwnd, GC_UPDATESTATUSBAR, 0, 0);
+	UpdateOptions();
+	UpdateStatusBar();
 	UpdateTitle();
 	SetWindowPosition();
 
@@ -971,7 +957,7 @@ void CChatRoomDlg::OnClick_Bold(CCtrlButton *pButton)
 		case IDC_ITALICS: cf.dwEffects |= CFE_ITALIC; break;
 		case IDC_UNDERLINE: cf.dwEffects |= CFE_UNDERLINE; break;
 	}
-	SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+	m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 }
 
 void CChatRoomDlg::OnClick_Color(CCtrlButton *pButton)
@@ -985,17 +971,17 @@ void CChatRoomDlg::OnClick_Color(CCtrlButton *pButton)
 
 	if (IsDlgButtonChecked(m_hwnd, IDC_COLOR)) {
 		if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) == 0)
-			SendMessage(m_hwnd, GC_SHOWCOLORCHOOSER, 0, IDC_COLOR);
+			ShowColorChooser(IDC_COLOR);
 		else if (m_bFGSet) {
 			cf.dwMask = CFM_COLOR;
 			cf.crTextColor = pci->MM_FindModule(m_si->pszModule)->crColors[m_iFG];
-			SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 		}
 	}
 	else {
 		cf.dwMask = CFM_COLOR;
 		cf.crTextColor = g_Settings.MessageAreaColor;
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+		m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 	}
 }
 
@@ -1010,17 +996,17 @@ void CChatRoomDlg::OnClick_BkColor(CCtrlButton *pButton)
 
 	if (IsDlgButtonChecked(m_hwnd, IDC_BKGCOLOR)) {
 		if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) == 0)
-			SendMessage(m_hwnd, GC_SHOWCOLORCHOOSER, 0, IDC_BKGCOLOR);
+			ShowColorChooser(IDC_BKGCOLOR);
 		else if (m_bBGSet) {
 			cf.dwMask = CFM_BACKCOLOR;
 			cf.crBackColor = pci->MM_FindModule(m_si->pszModule)->crColors[m_iBG];
-			SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 		}
 	}
 	else {
 		cf.dwMask = CFM_BACKCOLOR;
 		cf.crBackColor = (COLORREF)db_get_dw(0, CHAT_MODULE, "ColorMessageBG", GetSysColor(COLOR_WINDOW));
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
+		m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
 	}
 }
 
@@ -1032,9 +1018,9 @@ void CChatRoomDlg::OnClick_Filter(CCtrlButton *pButton)
 	m_bFilterEnabled = !m_bFilterEnabled;
 	SendDlgItemMessage(m_hwnd, IDC_FILTER, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bFilterEnabled ? "filter" : "filter2", FALSE));
 	if (m_bFilterEnabled && db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) == 0)
-		SendMessage(m_hwnd, GC_SHOWFILTERMENU, 0, 0);
+		ShowFilterMenu();
 	else
-		SendMessage(m_hwnd, GC_REDRAWLOG, 0, 0);
+		RedrawLog();
 }
 
 void CChatRoomDlg::OnClick_History(CCtrlButton *pButton)
@@ -1055,7 +1041,7 @@ void CChatRoomDlg::OnClick_NickList(CCtrlButton *pButton)
 	m_bNicklistEnabled = !m_bNicklistEnabled;
 	pButton->SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bNicklistEnabled ? "nicklist" : "nicklist2", FALSE));
 
-	SendMessage(m_hwnd, GC_SCROLLTOBOTTOM, 0, 0);
+	ScrollToBottom();
 	SendMessage(m_hwnd, WM_SIZE, 0, 0);
 }
 
@@ -1087,7 +1073,7 @@ void CChatRoomDlg::OnClick_Ok(CCtrlButton *pButton)
 
 	if (mi->bAckMsg) {
 		EnableWindow(m_message.GetHwnd(), FALSE);
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETREADONLY, TRUE, 0);
+		m_message.SendMsg(EM_SETREADONLY, TRUE, 0);
 	}
 	else SetDlgItemText(m_hwnd, IDC_MESSAGE, L"");
 
@@ -1111,9 +1097,9 @@ void CChatRoomDlg::OnListDblclick(CCtrlListBox*)
 		return;
 
 	if (GetKeyState(VK_SHIFT) & 0x8000) {
-		int start = LOWORD(SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_GETSEL, 0, 0));
+		int start = LOWORD(m_message.SendMsg(EM_GETSEL, 0, 0));
 		CMStringW buf(FORMAT, (start == 0) ? L"%s: " : L"%s ", ui->pszUID);
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_REPLACESEL, FALSE, (LPARAM)buf.c_str());
+		m_message.SendMsg(EM_REPLACESEL, FALSE, (LPARAM)buf.c_str());
 		PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
 	}
 	else DoEventHook(GC_USER_PRIVMESS, ui, nullptr, 0);
@@ -1213,6 +1199,8 @@ void CChatRoomDlg::SaveWindowPosition(bool bUpdateSession)
 	}
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 void CChatRoomDlg::CloseTab(bool)
 {
 	if (g_Settings.bTabsEnable)
@@ -1220,6 +1208,152 @@ void CChatRoomDlg::CloseTab(bool)
 	Close();
 }
 
+void CChatRoomDlg::RedrawLog()
+{
+	m_si->LastTime = 0;
+	if (m_si->pLog) {
+		LOGINFO * pLog = m_si->pLog;
+		if (m_si->iEventCount > 60) {
+			int index = 0;
+			while (index < 59) {
+				if (pLog->next == nullptr)
+					break;
+
+				pLog = pLog->next;
+				if (m_si->iType != GCW_CHATROOM || !m_bFilterEnabled || (m_iLogFilterFlags & pLog->iType) != 0)
+					index++;
+			}
+			StreamInEvents(pLog, true);
+			mir_forkthread(phase2, m_si);
+		}
+		else StreamInEvents(m_si->pLogEnd, true);
+	}
+	else ClearLog();
+}
+
+void CChatRoomDlg::ScrollToBottom()
+{
+	if ((GetWindowLongPtr(m_log.GetHwnd(), GWL_STYLE) & WS_VSCROLL) == 0)
+		return;
+
+	CHARRANGE sel;
+	SCROLLINFO scroll = {};
+	scroll.cbSize = sizeof(scroll);
+	scroll.fMask = SIF_PAGE | SIF_RANGE;
+	GetScrollInfo(m_log.GetHwnd(), SB_VERT, &scroll);
+
+	scroll.fMask = SIF_POS;
+	scroll.nPos = scroll.nMax - scroll.nPage + 1;
+	SetScrollInfo(m_log.GetHwnd(), SB_VERT, &scroll, TRUE);
+
+	sel.cpMin = sel.cpMax = GetRichTextLength(m_log.GetHwnd());
+	SendDlgItemMessage(m_hwnd, IDC_LOG, EM_EXSETSEL, 0, (LPARAM)&sel);
+	PostMessage(m_log.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
+}
+
+void CChatRoomDlg::ShowFilterMenu()
+{
+	HWND hwnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
+	TranslateDialogDefault(hwnd);
+
+	RECT rc;
+	GetWindowRect(m_btnFilter.GetHwnd(), &rc);
+	SetWindowPos(hwnd, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
+}
+
+void CChatRoomDlg::UpdateNickList()
+{
+	int i = SendDlgItemMessage(m_hwnd, IDC_LIST, LB_GETTOPINDEX, 0, 0);
+	SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETCOUNT, m_si->nUsersInNicklist, 0);
+	SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETTOPINDEX, i, 0);
+
+	UpdateTitle();
+}
+
+void CChatRoomDlg::UpdateOptions()
+{
+	m_btnNickList.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bNicklistEnabled ? "nicklist" : "nicklist2", FALSE));
+	m_btnFilter.SendMsg(BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bFilterEnabled ? "filter" : "filter2", FALSE));
+
+	MODULEINFO *mi = pci->MM_FindModule(m_si->pszModule);
+	EnableWindow(m_btnBold.GetHwnd(), mi->bBold);
+	EnableWindow(m_btnItalic.GetHwnd(), mi->bItalics);
+	EnableWindow(m_btnUnderline.GetHwnd(), mi->bUnderline);
+	EnableWindow(m_btnColor.GetHwnd(), mi->bColor);
+	EnableWindow(m_btnBkColor.GetHwnd(), mi->bBkgColor);
+	if (m_si->iType == GCW_CHATROOM)
+		EnableWindow(m_btnChannelMgr.GetHwnd(), mi->bChanMgr);
+
+	HICON hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
+	if (!hIcon) {
+		pci->MM_IconsChanged();
+		hIcon = (m_si->wStatus == ID_STATUS_ONLINE) ? mi->hOnlineIcon : mi->hOfflineIcon;
+	}
+
+	if (g_Settings.bTabsEnable)
+		pDialog->FixTabIcons(nullptr);
+
+	SendMessage(m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
+
+	Window_SetIcon_IcoLib(getCaptionWindow(), GetIconHandle("window"));
+
+	SendDlgItemMessage(m_hwnd, IDC_LOG, EM_SETBKGNDCOLOR, 0, g_Settings.crLogBackground);
+
+	CHARFORMAT2 cf;
+	cf.cbSize = sizeof(CHARFORMAT2);
+	cf.dwMask = CFM_COLOR | CFM_BOLD | CFM_UNDERLINE | CFM_BACKCOLOR;
+	cf.dwEffects = 0;
+	cf.crTextColor = g_Settings.MessageAreaColor;
+	cf.crBackColor = db_get_dw(0, CHAT_MODULE, "ColorMessageBG", GetSysColor(COLOR_WINDOW));
+	
+	m_message.SendMsg(EM_SETBKGNDCOLOR, 0, db_get_dw(0, CHAT_MODULE, "ColorMessageBG", GetSysColor(COLOR_WINDOW)));
+	m_message.SendMsg(WM_SETFONT, (WPARAM)g_Settings.MessageAreaFont, MAKELPARAM(TRUE, 0));
+	m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
+
+	// nicklist
+	int ih = GetTextPixelSize(L"AQGglo", g_Settings.UserListFont, FALSE);
+	int ih2 = GetTextPixelSize(L"AQGglo", g_Settings.UserListHeadingsFont, FALSE);
+	int height = db_get_b(0, CHAT_MODULE, "NicklistRowDist", 12);
+	int font = ih > ih2 ? ih : ih2;
+
+	// make sure we have space for icon!
+	if (g_Settings.bShowContactStatus)
+		font = font > 16 ? font : 16;
+
+	SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETITEMHEIGHT, 0, height > font ? height : font);
+	InvalidateRect(m_nickList.GetHwnd(), nullptr, TRUE);
+
+	SendMessage(m_hwnd, WM_SIZE, 0, 0);
+	RedrawLog2();
+}
+
+void CChatRoomDlg::UpdateStatusBar()
+{
+	MODULEINFO *mi = pci->MM_FindModule(m_si->pszModule);
+	wchar_t *ptszDispName = mi->ptszModDispName;
+	int x = 12;
+	x += GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_hwndStatus, WM_GETFONT, 0, 0), TRUE);
+	x += GetSystemMetrics(SM_CXSMICON);
+	int iStatusbarParts[2] = { x, -1 };
+	SendMessage(m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);
+
+	// stupid hack to make icons show. I dunno why this is needed currently
+	HICON hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
+	if (!hIcon) {
+		pci->MM_IconsChanged();
+		hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
+	}
+
+	SendMessage(m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
+
+	if (g_Settings.bTabsEnable)
+		pDialog->FixTabIcons(nullptr);
+
+	SendMessage(m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);
+	SendMessage(m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));
+	SendMessage(m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));
+}
+
 void CChatRoomDlg::UpdateTitle()
 {
 	wchar_t szTemp[100];
@@ -1242,66 +1376,14 @@ void CChatRoomDlg::UpdateTitle()
 	SetWindowText(getCaptionWindow(), szTemp);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	SESSION_INFO *s;
-	RECT rc;
 	CHARRANGE sel;
 
 	switch (uMsg) {
-	case GC_SETWNDPROPS:
-		SendDlgItemMessage(m_hwnd, IDC_SHOWNICKLIST, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bNicklistEnabled ? "nicklist" : "nicklist2", FALSE));
-		SendDlgItemMessage(m_hwnd, IDC_FILTER, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(m_bFilterEnabled ? "filter" : "filter2", FALSE));
-		{
-			MODULEINFO *mi = pci->MM_FindModule(m_si->pszModule);
-			EnableWindow(m_btnBold.GetHwnd(), mi->bBold);
-			EnableWindow(m_btnItalic.GetHwnd(), mi->bItalics);
-			EnableWindow(m_btnUnderline.GetHwnd(), mi->bUnderline);
-			EnableWindow(m_btnColor.GetHwnd(), mi->bColor);
-			EnableWindow(m_btnBkColor.GetHwnd(), mi->bBkgColor);
-			if (m_si->iType == GCW_CHATROOM)
-				EnableWindow(m_btnChannelMgr.GetHwnd(), mi->bChanMgr);
-
-			HICON hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
-			if (!hIcon) {
-				pci->MM_IconsChanged();
-				hIcon = (m_si->wStatus == ID_STATUS_ONLINE) ? mi->hOnlineIcon : mi->hOfflineIcon;
-			}
-
-			SendMessage(m_hwndParent, GC_FIXTABICONS, 0, 0);
-			SendMessage(m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
-		}
-		Window_SetIcon_IcoLib(getCaptionWindow(), GetIconHandle("window"));
-
-		SendDlgItemMessage(m_hwnd, IDC_LOG, EM_SETBKGNDCOLOR, 0, g_Settings.crLogBackground);
-
-		CHARFORMAT2 cf;
-		cf.cbSize = sizeof(CHARFORMAT2);
-		cf.dwMask = CFM_COLOR | CFM_BOLD | CFM_UNDERLINE | CFM_BACKCOLOR;
-		cf.dwEffects = 0;
-		cf.crTextColor = g_Settings.MessageAreaColor;
-		cf.crBackColor = db_get_dw(0, CHAT_MODULE, "ColorMessageBG", GetSysColor(COLOR_WINDOW));
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETBKGNDCOLOR, 0, db_get_dw(0, CHAT_MODULE, "ColorMessageBG", GetSysColor(COLOR_WINDOW)));
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, WM_SETFONT, (WPARAM)g_Settings.MessageAreaFont, MAKELPARAM(TRUE, 0));
-		SendDlgItemMessage(m_hwnd, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
-		{
-			// nicklist
-			int ih = GetTextPixelSize(L"AQGglo", g_Settings.UserListFont, FALSE);
-			int ih2 = GetTextPixelSize(L"AQGglo", g_Settings.UserListHeadingsFont, FALSE);
-			int height = db_get_b(0, CHAT_MODULE, "NicklistRowDist", 12);
-			int font = ih > ih2 ? ih : ih2;
-
-			// make sure we have space for icon!
-			if (g_Settings.bShowContactStatus)
-				font = font > 16 ? font : 16;
-
-			SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETITEMHEIGHT, 0, height > font ? height : font);
-			InvalidateRect(m_nickList.GetHwnd(), nullptr, TRUE);
-		}
-		SendMessage(m_hwnd, WM_SIZE, 0, 0);
-		SendMessage(m_hwnd, GC_REDRAWLOG2, 0, 0);
-		break;
-
 	case WM_CBD_LOADICONS:
 		Srmm_UpdateToolbarIcons(m_hwnd);
 		break;
@@ -1310,36 +1392,9 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		SetButtonsPos(m_hwnd, true);
 		break;
 
-	case GC_UPDATESTATUSBAR:
-		{
-			MODULEINFO *mi = pci->MM_FindModule(m_si->pszModule);
-			wchar_t *ptszDispName = mi->ptszModDispName;
-			int x = 12;
-			x += GetTextPixelSize(ptszDispName, (HFONT)SendMessage(m_hwndStatus, WM_GETFONT, 0, 0), TRUE);
-			x += GetSystemMetrics(SM_CXSMICON);
-			int iStatusbarParts[2] = { x, -1 };
-			SendMessage(m_hwndStatus, SB_SETPARTS, 2, (LPARAM)&iStatusbarParts);
-
-			// stupid hack to make icons show. I dunno why this is needed currently
-			HICON hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
-			if (!hIcon) {
-				pci->MM_IconsChanged();
-				hIcon = m_si->wStatus == ID_STATUS_ONLINE ? mi->hOnlineIcon : mi->hOfflineIcon;
-			}
-
-			SendMessage(m_hwndStatus, SB_SETICON, 0, (LPARAM)hIcon);
-			SendMessage(m_hwndParent, GC_FIXTABICONS, 0, 0);
-
-			SendMessage(m_hwndStatus, SB_SETTEXT, 0, (LPARAM)ptszDispName);
-
-			SendMessage(m_hwndStatus, SB_SETTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));
-			SendMessage(m_hwndStatus, SB_SETTIPTEXT, 1, (LPARAM)(m_si->ptszStatusbarText ? m_si->ptszStatusbarText : L""));
-		}
-		return TRUE;
-
 	case WM_SIZE:
 		if (wParam == SIZE_MAXIMIZED)
-			PostMessage(m_hwnd, GC_SCROLLTOBOTTOM, 0, 0);
+			ScrollToBottom();
 
 		if (!IsIconic(m_hwnd)) {
 			SendMessage(m_hwndStatus, WM_SIZE, 0, 0);
@@ -1388,45 +1443,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 		return TRUE;
 
-	case GC_REDRAWWINDOW:
-		InvalidateRect(m_hwnd, nullptr, TRUE);
-		break;
-
-	case GC_REDRAWLOG:
-		m_si->LastTime = 0;
-		if (m_si->pLog) {
-			LOGINFO * pLog = m_si->pLog;
-			if (m_si->iEventCount > 60) {
-				int index = 0;
-				while (index < 59) {
-					if (pLog->next == nullptr)
-						break;
-
-					pLog = pLog->next;
-					if (m_si->iType != GCW_CHATROOM || !m_bFilterEnabled || (m_iLogFilterFlags&pLog->iType) != 0)
-						index++;
-				}
-				Log_StreamInEvent(pLog, TRUE);
-				mir_forkthread(phase2, m_si);
-			}
-			else Log_StreamInEvent(m_si->pLogEnd, TRUE);
-		}
-		else ClearLog();
-		break;
-
-	case GC_REDRAWLOG2:
-		m_si->LastTime = 0;
-		if (m_si->pLog)
-			Log_StreamInEvent(m_si->pLogEnd, TRUE);
-		break;
-
-	case GC_ADDLOG:
-		if (m_si->pLogEnd)
-			Log_StreamInEvent(m_si->pLog, FALSE);
-		else
-			ClearLog();
-		break;
-
 	case WM_CTLCOLORLISTBOX:
 		SetBkColor((HDC)wParam, g_Settings.crUserListBGColor);
 		return (INT_PTR)pci->hListBkgBrush;
@@ -1498,45 +1514,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 
-	case GC_UPDATENICKLIST:
-		{
-			int i = SendDlgItemMessage(m_hwnd, IDC_LIST, LB_GETTOPINDEX, 0, 0);
-			SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETCOUNT, m_si->nUsersInNicklist, 0);
-			SendDlgItemMessage(m_hwnd, IDC_LIST, LB_SETTOPINDEX, i, 0);
-		}
-		UpdateTitle();
-		break;
-
-	case GC_SHOWFILTERMENU:
-		{
-			HWND hwnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
-			TranslateDialogDefault(hwnd);
-			GetWindowRect(m_btnFilter.GetHwnd(), &rc);
-			SetWindowPos(hwnd, HWND_TOP, rc.left - 85, (IsWindowVisible(m_btnFilter.GetHwnd()) || IsWindowVisible(m_btnBold.GetHwnd())) ? rc.top - 206 : rc.top - 186, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW);
-		}
-		break;
-
-	case GC_SHOWCOLORCHOOSER:
-		pci->ColorChooser(m_si, lParam == IDC_COLOR, m_hwnd, m_message.GetHwnd(), GetDlgItem(m_hwnd, lParam));
-		break;
-
-	case GC_SCROLLTOBOTTOM:
-		if ((GetWindowLongPtr(m_log.GetHwnd(), GWL_STYLE) & WS_VSCROLL) != 0) {
-			SCROLLINFO scroll = {};
-			scroll.cbSize = sizeof(scroll);
-			scroll.fMask = SIF_PAGE | SIF_RANGE;
-			GetScrollInfo(m_log.GetHwnd(), SB_VERT, &scroll);
-
-			scroll.fMask = SIF_POS;
-			scroll.nPos = scroll.nMax - scroll.nPage + 1;
-			SetScrollInfo(m_log.GetHwnd(), SB_VERT, &scroll, TRUE);
-
-			sel.cpMin = sel.cpMax = GetRichTextLength(m_log.GetHwnd());
-			SendDlgItemMessage(m_hwnd, IDC_LOG, EM_EXSETSEL, 0, (LPARAM)&sel);
-			PostMessage(m_log.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
-		}
-		break;
-
 	case WM_TIMER:
 		if (wParam == TIMERID_FLASHWND)
 			FlashWindow(m_hwnd, TRUE);
@@ -1547,7 +1524,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			if (g_Settings.bTabsEnable) {
 				m_si->wState &= ~GC_EVENT_HIGHLIGHT;
 				m_si->wState &= ~STATE_TALK;
-				SendMessage(m_hwndParent, GC_FIXTABICONS, 0, (LPARAM)this);
+				pDialog->FixTabIcons(nullptr);
 			}
 			break;
 		}
@@ -1715,7 +1692,7 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 	case WM_LBUTTONDBLCLK:
 		if (LOWORD(lParam) < 30)
-			PostMessage(m_hwnd, GC_SCROLLTOBOTTOM, 0, 0);
+			ScrollToBottom();
 		break;
 	}
 	
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 60c2ef2d8f..c3509bdb46 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -99,7 +99,6 @@ public:
 

 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

 	

-	virtual void CloseTab(bool) override {}

 	virtual void UpdateTitle() override {}

 

 	void OnSplitterMoved(CSplitter*);

diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 5c77fca204..d9959618aa 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -161,6 +161,38 @@ char* Message_GetFromStream(HWND hwndDlg, SESSION_INFO *si);
 void  NotifyLocalWinEvent(MCONTACT hContact, HWND hwnd, unsigned int type);

 

 // tabs.cpp

+

+struct CTabbedWindow : public CDlgBase

+{

+	CCtrlPages m_tab;

+

+	CTabbedWindow() :

+		CDlgBase(g_hInst, IDD_CONTAINER),

+		m_tab(this, IDC_TAB)

+	{}

+

+	void AddPage(SESSION_INFO*, int insertAt = -1);

+	void FixTabIcons(CChatRoomDlg*);

+	void SetMessageHighlight(CChatRoomDlg*);

+	void SetTabHighlight(CChatRoomDlg*);

+	void TabClicked();

+

+	virtual void OnInitDialog() override;

+	virtual void OnDestroy() override;

+

+	virtual int Resizer(UTILRESIZECONTROL *urc)

+	{

+		if (urc->wId == IDC_TAB)

+			return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;

+

+		return RD_ANCHORX_LEFT | RD_ANCHORY_TOP;

+	}

+

+	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

+};

+

+extern CTabbedWindow *pDialog;

+

 void InitTabs(void);

 void UninitTabs(void);

 

@@ -195,7 +227,6 @@ class CChatRoomDlg : public CSrmmBaseDialog
 	{	return (g_Settings.bTabsEnable) ? GetParent(m_hwndParent) : m_hwnd;

 	}

 

-	void Log_StreamInEvent(LOGINFO *lin, BOOL bRedraw);

 	void SaveWindowPosition(bool bUpdateSession);

 	void SetWindowPosition();

 

@@ -211,6 +242,13 @@ public:
 	virtual int Resizer(UTILRESIZECONTROL *urc) override;

 	

 	virtual void CloseTab(bool bForced = false) override;

+	virtual void RedrawLog() override;

+	virtual void StreamInEvents(LOGINFO* lin, bool bRedraw) override;

+	virtual void ScrollToBottom() override;

+	virtual void ShowFilterMenu() override;

+	virtual void UpdateNickList() override;

+	virtual void UpdateOptions() override;

+	virtual void UpdateStatusBar() override;

 	virtual void UpdateTitle() override;

 

 	void OnClick_Bold(CCtrlButton*);

diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index 40357f92eb..e5e1a3d4f1 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -42,32 +42,6 @@ void TB_SaveSession(SESSION_INFO *si)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-struct CTabbedWindow : public CDlgBase
-{
-	CCtrlPages m_tab;
-
-	CTabbedWindow() :
-		CDlgBase(g_hInst, IDD_CONTAINER),
-		m_tab(this, IDC_TAB)
-	{}
-
-	void AddPage(SESSION_INFO*, int insertAt = -1);
-	void TabClicked();
-
-	virtual void OnInitDialog() override;
-	virtual void OnDestroy() override;
-
-	virtual int Resizer(UTILRESIZECONTROL *urc)
-	{
-		if (urc->wId == IDC_TAB)
-			return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT;
-
-		return RD_ANCHORX_LEFT | RD_ANCHORY_TOP;
-	}
-
-	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
-};
-
 static LRESULT CALLBACK TabSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	CTabbedWindow *pOwner = (CTabbedWindow*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
@@ -217,7 +191,7 @@ void CTabbedWindow::AddPage(SESSION_INFO *si, int insertAt)
 
 		CChatRoomDlg *pTab = new CChatRoomDlg(si);
 		m_tab.AddPage(szTemp, NULL, pTab);
-		SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pTab);
+		FixTabIcons(pTab);
 
 		m_tab.ActivatePage(m_tab.GetCount() - 1);
 	}
@@ -225,13 +199,67 @@ void CTabbedWindow::AddPage(SESSION_INFO *si, int insertAt)
 		m_tab.ActivatePage(indexfound);
 }
 
+void CTabbedWindow::FixTabIcons(CChatRoomDlg *pDlg)
+{
+	if (pDlg != nullptr) {
+		int idx = m_tab.GetDlgIndex(pDlg);
+		if (idx == -1)
+			return;
+
+		SESSION_INFO *si = pDlg->m_si;
+		int image = 0;
+		if (!(si->wState & GC_EVENT_HIGHLIGHT)) {
+			MODULEINFO *mi = pci->MM_FindModule(si->pszModule);
+			image = (si->wStatus == ID_STATUS_ONLINE) ? mi->OnlineIconIndex : mi->OfflineIconIndex;
+			if (si->wState & STATE_TALK)
+				image++;
+		}
+
+		TCITEM tci = {};
+		tci.mask = TCIF_IMAGE;
+		TabCtrl_GetItem(m_tab.GetHwnd(), idx, &tci);
+		if (tci.iImage != image) {
+			tci.iImage = image;
+			TabCtrl_SetItem(m_tab.GetHwnd(), idx, &tci);
+		}
+	}
+	else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
+}
+
+void CTabbedWindow::SetMessageHighlight(CChatRoomDlg *pDlg)
+{
+	if (pDlg != nullptr) {
+		if (m_tab.GetDlgIndex(pDlg) == -1)
+			return;
+
+		pDlg->m_si->wState |= GC_EVENT_HIGHLIGHT;
+		FixTabIcons(pDlg);
+		if (g_Settings.bFlashWindowHighlight && GetActiveWindow() != m_hwnd && GetForegroundWindow() != m_hwnd)
+			SetTimer(m_hwnd, TIMERID_FLASHWND, 900, NULL);
+	}
+	else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
+}
+
+void CTabbedWindow::SetTabHighlight(CChatRoomDlg *pDlg)
+{
+	if (pDlg != nullptr) {
+		if (m_tab.GetDlgIndex(pDlg) == -1)
+			return;
+
+		FixTabIcons(pDlg);
+		if (g_Settings.bFlashWindow && GetActiveWindow() != m_hwnd && GetForegroundWindow() != m_hwnd)
+			SetTimer(m_hwnd, TIMERID_FLASHWND, 900, NULL);
+	}
+	else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
+}
+
 void CTabbedWindow::TabClicked()
 {
-	CDlgBase *pDlg = m_tab.GetActivePage();
+	CChatRoomDlg *pDlg = (CChatRoomDlg*)m_tab.GetActivePage();
 	if (pDlg == NULL)
 		return;
 
-	SESSION_INFO *s = ((CChatRoomDlg*)pDlg)->m_si;
+	SESSION_INFO *s = pDlg->m_si;
 	if (s) {
 		if (s->wState & STATE_TALK) {
 			s->wState &= ~STATE_TALK;
@@ -245,7 +273,7 @@ void CTabbedWindow::TabClicked()
 				pcli->pfnRemoveEvent(s->hContact, GC_FAKE_EVENT);
 		}
 
-		SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pDlg);
+		FixTabIcons(pDlg);
 		if (!s->pDlg) {
 			pci->ShowRoom(s);
 			SendMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
@@ -260,32 +288,6 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		AddPage((SESSION_INFO*)lParam);
 		break;
 
-	case GC_FIXTABICONS:
-		if (CChatRoomDlg *pDlg = (CChatRoomDlg*)lParam) {
-			int idx = m_tab.GetDlgIndex(pDlg);
-			if (idx == -1)
-				break;
-
-			SESSION_INFO *si = pDlg->m_si;
-			int image = 0;
-			if (!(si->wState & GC_EVENT_HIGHLIGHT)) {
-				MODULEINFO *mi = pci->MM_FindModule(si->pszModule);
-				image = (si->wStatus == ID_STATUS_ONLINE) ? mi->OnlineIconIndex : mi->OfflineIconIndex;
-				if (si->wState & STATE_TALK)
-					image++;
-			}
-
-			TCITEM tci = {};
-			tci.mask = TCIF_IMAGE;
-			TabCtrl_GetItem(m_tab.GetHwnd(), idx, &tci);
-			if (tci.iImage != image) {
-				tci.iImage = image;
-				TabCtrl_SetItem(m_tab.GetHwnd(), idx, &tci);
-			}
-		}
-		else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
-		break;
-
 	case GC_SWITCHNEXTTAB:
 		{
 			int total = m_tab.GetCount();
@@ -344,35 +346,9 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 
-	case GC_SETMESSAGEHIGHLIGHT:
-		if (CChatRoomDlg *pDlg = (CChatRoomDlg*)lParam) {
-			if (m_tab.GetDlgIndex(pDlg) == -1)
-				break;
-
-			pDlg->m_si->wState |= GC_EVENT_HIGHLIGHT;
-			SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pDlg);
-			if (g_Settings.bFlashWindowHighlight && GetActiveWindow() != m_hwnd && GetForegroundWindow() != m_hwnd)
-				SetTimer(m_hwnd, TIMERID_FLASHWND, 900, NULL);
-		}
-		else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
-		break;
-
-	case GC_SETTABHIGHLIGHT:
-		if (CChatRoomDlg *pDlg = (CChatRoomDlg*)lParam) {
-			if (m_tab.GetDlgIndex(pDlg) == -1)
-				break;
-
-			SendMessage(m_hwnd, GC_FIXTABICONS, 0, (LPARAM)pDlg);
-			if (g_Settings.bFlashWindow && GetActiveWindow() != m_hwnd && GetForegroundWindow() != m_hwnd)
-				SetTimer(m_hwnd, TIMERID_FLASHWND, 900, NULL);
-			break;
-		}
-		else RedrawWindow(m_tab.GetHwnd(), NULL, NULL, RDW_INVALIDATE);
-		break;
-
 	case GC_TABCHANGE:
 		SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)lParam);
-		PostMessage(m_hwnd, GC_SCROLLTOBOTTOM, 0, 0);
+		// ScrollToBottom();
 		break;
 
 	case GC_DROPPEDTAB:
@@ -486,7 +462,7 @@ INT_PTR CTabbedWindow::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static CTabbedWindow *pDialog = NULL;
+CTabbedWindow *pDialog = nullptr;
 
 void CTabbedWindow::OnDestroy()
 {
@@ -546,11 +522,11 @@ void ShowRoom(SESSION_INFO *si)
 
 		PostMessage(si->pDlg->GetHwnd(), WM_SIZE, 0, 0);
 		if (si->iType != GCW_SERVER)
-			SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);
+			si->pDlg->UpdateNickList();
 		else
 			si->pDlg->UpdateTitle();
-		SendMessage(si->pDlg->GetHwnd(), GC_REDRAWLOG, 0, 0);
-		SendMessage(si->pDlg->GetHwnd(), GC_UPDATESTATUSBAR, 0, 0);
+		si->pDlg->RedrawLog();
+		si->pDlg->UpdateStatusBar();
 	}
 
 	SetWindowLongPtr(si->pDlg->GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(si->pDlg->GetHwnd(), GWL_EXSTYLE) | WS_EX_APPWINDOW);
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index d8cfe40999..72863f26d7 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -242,7 +242,7 @@ BOOL SM_RemoveUser(const wchar_t *pszID, const char *pszModule, const wchar_t *p
 			chatApi.UM_RemoveUser(&si->pUsers, pszUID);

 

 			if (si->pDlg)

-				SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+				si->pDlg->UpdateNickList();

 

 			if (pszID)

 				return TRUE;

@@ -268,7 +268,7 @@ BOOL SM_GiveStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *p
 	if (ui) {

 		SM_MoveUser(si->ptszID, si->pszModule, ui->pszUID);

 		if (si->pDlg)

-			SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+			si->pDlg->UpdateNickList();

 	}

 	return TRUE;

 }

@@ -283,7 +283,7 @@ BOOL SM_SetContactStatus(const wchar_t *pszID, const char *pszModule, const wcha
 	if (ui) {

 		SM_MoveUser(si->ptszID, si->pszModule, ui->pszUID);

 		if (si->pDlg)

-			SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+			si->pDlg->UpdateNickList();

 	}

 	return TRUE;

 }

@@ -298,7 +298,7 @@ BOOL SM_TakeStatus(const wchar_t *pszID, const char *pszModule, const wchar_t *p
 	if (ui) {

 		SM_MoveUser(si->ptszID, si->pszModule, ui->pszUID);

 		if (si->pDlg)

-			SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+			si->pDlg->UpdateNickList();

 	}

 	return TRUE;

 }

@@ -349,7 +349,7 @@ BOOL SM_ChangeNick(const wchar_t *pszID, const char *pszModule, GCEVENT *gce)
 				replaceStrW(ui->pszNick, gce->ptszText);

 				SM_MoveUser(si->ptszID, si->pszModule, ui->pszUID);

 				if (si->pDlg)

-					SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+					si->pDlg->UpdateNickList();

 				if (chatApi.OnChangeNick)

 					chatApi.OnChangeNick(si);

 			}

@@ -1110,7 +1110,6 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_GetInterface(CHAT_MANAGER_INITDATA *pInit, int _
 	chatApi.IsHighlighted = IsHighlighted;

 	chatApi.RemoveFormatting = RemoveFormatting;

 	chatApi.ReloadSettings = LoadGlobalSettings;

-	chatApi.ColorChooser = ColorChooser;

 

 	chatApi.pLogIconBmpBits = pLogIconBmpBits;

 

diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index d7ac64cd01..d6d5126f33 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -85,7 +85,7 @@ static int FontsChanged(WPARAM, LPARAM)
 

 	chatApi.MM_FontsChanged();

 	chatApi.MM_FixColors();

-	chatApi.SM_BroadcastMessage(nullptr, GC_SETWNDPROPS, 0, 0, TRUE);

+	Chat_UpdateOptions();

 	return 0;

 }

 

@@ -95,7 +95,7 @@ static int IconsChanged(WPARAM, LPARAM)
 	LoadMsgLogBitmaps();

 

 	chatApi.MM_IconsChanged();

-	chatApi.SM_BroadcastMessage(nullptr, GC_SETWNDPROPS, 0, 0, FALSE);

+	Chat_UpdateOptions();

 	return 0;

 }

 

@@ -113,7 +113,11 @@ static int PreShutdown(WPARAM, LPARAM)
 

 static int SmileyOptionsChanged(WPARAM, LPARAM)

 {

-	chatApi.SM_BroadcastMessage(nullptr, GC_REDRAWLOG, 0, 1, FALSE);

+	for (int i = 0; i < g_arSessions.getCount(); i++) {

+		SESSION_INFO *si = g_arSessions[i];

+		if (si->pDlg)

+			si->pDlg->RedrawLog();

+	}

 	return 0;

 }

 

@@ -296,15 +300,15 @@ static INT_PTR __stdcall stubRoomControl(void *param)
 		SM_SetOffline(si);

 		SM_SetStatus(si, ID_STATUS_OFFLINE);

 		if (si->pDlg) {

-			::SendMessage(si->pDlg->GetHwnd(), GC_UPDATESTATUSBAR, 0, 0);

-			::SendMessage(si->pDlg->GetHwnd(), GC_UPDATENICKLIST, 0, 0);

+			si->pDlg->UpdateStatusBar();

+			si->pDlg->UpdateNickList();

 		}

 		break;

 

 	case SESSION_ONLINE:

 		SM_SetStatus(si, ID_STATUS_ONLINE);

 		if (si->pDlg)

-			::SendMessage(si->pDlg->GetHwnd(), GC_UPDATESTATUSBAR, 0, 0);

+			si->pDlg->UpdateStatusBar();

 		break;

 

 	case WINDOW_CLEARLOG:

@@ -409,9 +413,9 @@ static BOOL AddEventToAllMatchingUID(GCEVENT *gce)
 

 		if (p->pDlg && p->bInitDone) {

 			if (SM_AddEvent(p->ptszID, p->pszModule, gce, FALSE))

-				SendMessage(p->pDlg->GetHwnd(), GC_ADDLOG, 0, 0);

+				p->pDlg->AddLog();

 			else

-				SendMessage(p->pDlg->GetHwnd(), GC_REDRAWLOG2, 0, 0);

+				p->pDlg->RedrawLog2();

 		}

 

 		if (!(gce->dwFlags & GCEF_NOTNOTIFY)) {

@@ -555,9 +559,9 @@ EXTERN_C MIR_APP_DLL(int) Chat_Event(GCEVENT *gce)
 			int isOk = SM_AddEvent(pWnd, pMod, gce, bIsHighlighted);

 			if (si->pDlg) {

 				if (isOk)

-					SendMessage(si->pDlg->GetHwnd(), GC_ADDLOG, 0, 0);

+					si->pDlg->AddLog();

 				else

-					SendMessage(si->pDlg->GetHwnd(), GC_REDRAWLOG2, 0, 0);

+					si->pDlg->RedrawLog2();

 			}

 

 			if (!(gce->dwFlags & GCEF_NOTNOTIFY)) {

@@ -689,7 +693,7 @@ MIR_APP_DLL(int) Chat_SetStatusbarText(const char *szModule, const wchar_t *wszI
 			db_set_s(si->hContact, si->pszModule, "StatusBar", "");

 

 		if (si->pDlg)

-			SendMessage(si->pDlg->GetHwnd(), GC_UPDATESTATUSBAR, 0, 0);

+			si->pDlg->UpdateStatusBar();

 	}

 	return 0;

 }

@@ -724,6 +728,15 @@ MIR_APP_DLL(int) Chat_SetUserInfo(const char *szModule, const wchar_t *wszId, vo
 	return GC_EVENT_ERROR;

 }

 

+EXTERN_C MIR_APP_DLL(void) Chat_UpdateOptions()

+{

+	for (int i = 0; i < g_arSessions.getCount(); i++) {

+		SESSION_INFO *si = g_arSessions[i];

+		if (si->pDlg)

+			si->pDlg->UpdateOptions();

+	}

+}

+

 /////////////////////////////////////////////////////////////////////////////////////////

 // module initialization

 

diff --git a/src/mir_app/src/colorchooser.cpp b/src/mir_app/src/colorchooser.cpp
index aa6fd06cb1..731239b8c1 100644
--- a/src/mir_app/src/colorchooser.cpp
+++ b/src/mir_app/src/colorchooser.cpp
@@ -265,8 +265,8 @@ public:
 	}

 };

 

-void ColorChooser(SESSION_INFO *si, BOOL bFG, HWND hwndDlg, HWND hwndTarget, HWND hwndChooser)

+void CSrmmBaseDialog::ShowColorChooser(int iCtrlId)

 {

-	CColorChooserDlg *pDialog = new CColorChooserDlg(si, bFG, hwndDlg, hwndTarget, hwndChooser);

+	CColorChooserDlg *pDialog = new CColorChooserDlg(m_si, iCtrlId == m_pColor->GetCtrlId(), m_hwnd, m_pEntry->GetHwnd(), GetDlgItem(m_hwnd, iCtrlId));

 	pDialog->Show();

 }

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 1628ca17a9..4c35385bb0 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -412,3 +412,16 @@ Srmm_LogStreamCallback @412
 Srmm_MessageStreamCallback @413

 ?DoEventHook@CSrmmBaseDialog@@IAEXHPBUUSERINFO@@PB_WH@Z @414 NONAME

 ?ClearLog@CSrmmBaseDialog@@QAEXXZ @415 NONAME

+?CloseTab@CSrmmBaseDialog@@UAEX_N@Z @416 NONAME

+?UpdateStatusBar@CSrmmBaseDialog@@UAEXXZ @417 NONAME

+Chat_UpdateOptions @418 NONAME

+?RedrawLog@CSrmmBaseDialog@@UAEXXZ @419 NONAME

+?UpdateOptions@CSrmmBaseDialog@@UAEXXZ @420 NONAME

+?ShowColorChooser@CSrmmBaseDialog@@QAEXH@Z @421 NONAME

+?ShowFilterMenu@CSrmmBaseDialog@@UAEXXZ @422 NONAME

+_Srmm_ButtonSubclassProc@16 @423 NONAME

+?StreamInEvents@CSrmmBaseDialog@@UAEXPAULOGINFO@@_N@Z @424 NONAME

+?AddLog@CSrmmBaseDialog@@UAEXXZ @425 NONAME

+?RedrawLog2@CSrmmBaseDialog@@QAEXXZ @426 NONAME

+?ScrollToBottom@CSrmmBaseDialog@@UAEXXZ @427 NONAME

+?UpdateNickList@CSrmmBaseDialog@@UAEXXZ @428 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index ad9ab48e67..b9521316af 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -412,3 +412,16 @@ Srmm_LogStreamCallback @412
 Srmm_MessageStreamCallback @413

 ?DoEventHook@CSrmmBaseDialog@@IEAAXHPEBUUSERINFO@@PEB_W_J@Z @414 NONAME

 ?ClearLog@CSrmmBaseDialog@@QEAAXXZ @415 NONAME

+?CloseTab@CSrmmBaseDialog@@UEAAX_N@Z @416 NONAME

+?UpdateStatusBar@CSrmmBaseDialog@@UEAAXXZ @417 NONAME

+Chat_UpdateOptions @418 NONAME

+?RedrawLog@CSrmmBaseDialog@@UEAAXXZ @419 NONAME

+?UpdateOptions@CSrmmBaseDialog@@UEAAXXZ @420 NONAME

+?ShowColorChooser@CSrmmBaseDialog@@QEAAXH@Z @421 NONAME

+?ShowFilterMenu@CSrmmBaseDialog@@UEAAXXZ @422 NONAME

+Srmm_ButtonSubclassProc @423 NONAME

+?StreamInEvents@CSrmmBaseDialog@@UEAAXPEAULOGINFO@@_N@Z @424 NONAME

+?AddLog@CSrmmBaseDialog@@UEAAXXZ @425 NONAME

+?RedrawLog2@CSrmmBaseDialog@@QEAAXXZ @426 NONAME

+?ScrollToBottom@CSrmmBaseDialog@@UEAAXXZ @427 NONAME

+?UpdateNickList@CSrmmBaseDialog@@UEAAXXZ @428 NONAME

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 1f017289b4..8df17b3fd7 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -32,6 +32,9 @@ CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog, SESSION_INFO *si
 	m_si(si),
 	m_pLog(nullptr),
 	m_pEntry(nullptr),
+	m_pFilter(nullptr),
+	m_pColor(nullptr),
+	m_pBkColor(nullptr),
 	m_hContact(0)
 {
 	m_bFilterEnabled = db_get_b(0, CHAT_MODULE, "FilterEnabled", 0) != 0;
@@ -138,6 +141,14 @@ INT_PTR CSrmmBaseDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	return CDlgBase::DlgProc(msg, wParam, lParam);
 }
 
+void CSrmmBaseDialog::AddLog()
+{
+	if (m_si->pLogEnd)
+		StreamInEvents(m_si->pLog, false);
+	else
+		ClearLog();
+}
+
 void CSrmmBaseDialog::ClearLog()
 {
 	if (m_pLog != nullptr)
@@ -162,3 +173,10 @@ void CSrmmBaseDialog::DoEventHook(int iType, const USERINFO *pUser, const wchar_
 	gch.pDest = &gcd;
 	NotifyEventHooks(chatApi.hSendEvent, 0, (WPARAM)&gch);
 }
+
+void CSrmmBaseDialog::RedrawLog2()
+{
+	m_si->LastTime = 0;
+	if (m_si->pLog)
+		StreamInEvents(m_si->pLogEnd, TRUE);
+}
diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp
index 78ed59e436..e9aeffc33c 100644
--- a/src/mir_app/src/srmm_util.cpp
+++ b/src/mir_app/src/srmm_util.cpp
@@ -72,3 +72,25 @@ MIR_APP_DLL(DWORD) CALLBACK Srmm_MessageStreamCallback(DWORD_PTR dwCookie, LPBYT
 	}
 	return 0;
 }
+
+EXTERN_C MIR_APP_DLL(LRESULT) CALLBACK Srmm_ButtonSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch (msg) {
+	case WM_RBUTTONUP:
+		if (db_get_b(0, CHAT_MODULE, "RightClickFilter", 0) != 0) {
+			CSrmmBaseDialog *pDlg = (CSrmmBaseDialog*)GetWindowLongPtr(GetParent(hwnd), GWLP_USERDATA);
+			if (pDlg == nullptr)
+				break;
+
+			if (hwnd == pDlg->m_pFilter->GetHwnd())
+				pDlg->ShowFilterMenu();
+			else if (hwnd == pDlg->m_pColor->GetHwnd())
+				pDlg->ShowColorChooser(pDlg->m_pColor->GetCtrlId());
+			else if (hwnd == pDlg->m_pBkColor->GetHwnd())
+				pDlg->ShowColorChooser(pDlg->m_pBkColor->GetCtrlId());
+		}
+		break;
+	}
+
+	return mir_callNextSubclass(hwnd, Srmm_ButtonSubclassProc, msg, wParam, lParam);
+}