fixes #3260 (YAMN: отключать выпадающее меню, если нет учёток)

2 files changed, 1023 insertions, 1155 deletions

diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index 577acd3285..51c569d5d3 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -13,61 +13,182 @@ static char DlgInput[MAX_PATH];
 
 void CheckMenuItems();
 
-//--------------------------------------------------------------------------------------------------
+static BOOL DlgSetItemText(HWND hDlg, WPARAM wParam, const char *str)
+{
+	if (str == nullptr)
+		SetDlgItemTextA(hDlg, wParam, "");
+	else
+		SetDlgItemTextA(hDlg, wParam, str);
+	return TRUE;
+}
 
-static INT_PTR CALLBACK DlgProcYAMNOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static BOOL DlgSetItemTextW(HWND hDlg, WPARAM wParam, const wchar_t *str)
 {
-	switch (msg) {
-	case WM_INITDIALOG:
-		TranslateDialogDefault(hDlg);
-		CheckDlgButton(hDlg, IDC_CHECKTTB, g_plugin.getByte(YAMN_TTBFCHECK, 1) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_LONGDATE, (optDateTime&SHOWDATELONG) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_SMARTDATE, (optDateTime&SHOWDATENOTODAY) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_NOSECONDS, (optDateTime&SHOWDATENOSECONDS) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_MAINMENU, g_plugin.getByte(YAMN_SHOWMAINMENU, 1) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_YAMNASPROTO, g_plugin.getByte(YAMN_SHOWASPROTO, 1) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CLOSEONDELETE, g_plugin.getByte(YAMN_CLOSEDELETE, 0) ? BST_CHECKED : BST_UNCHECKED);
-		break;
+	if (str == nullptr)
+		SetDlgItemTextW(hDlg, wParam, L"");
+	else
+		SetDlgItemTextW(hDlg, wParam, str);
+	return TRUE;
+}
 
-	case WM_COMMAND:
-		switch (LOWORD(wParam)) {
-		case IDC_YAMNASPROTO:
-		case IDC_MAINMENU:
-		case IDC_CHECKTTB:
-		case IDC_CLOSEONDELETE:
-		case IDC_LONGDATE:
-		case IDC_SMARTDATE:
-		case IDC_NOSECONDS:
-			SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
-			break;
+struct CBaseOptionsDlg : public CDlgBase
+{
+	CBaseOptionsDlg(int iDlgId) :
+		CDlgBase(g_plugin, iDlgId)
+	{}
+
+	void DlgShowAccount(HPOP3ACCOUNT pAccount)
+	{
+		int i;
+
+		if (pAccount) {
+			// we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
+			WaitToRead(pAccount);
+
+			DlgSetItemText(m_hwnd, IDC_EDITSERVER, pAccount->Server->Name);
+			DlgSetItemText(m_hwnd, IDC_EDITNAME, pAccount->Name);
+			DlgSetItemText(m_hwnd, IDC_EDITLOGIN, pAccount->Server->Login);
+			DlgSetItemText(m_hwnd, IDC_EDITPASS, pAccount->Server->Passwd);
+			DlgSetItemTextW(m_hwnd, IDC_EDITAPP, pAccount->NewMailN.App);
+			DlgSetItemTextW(m_hwnd, IDC_EDITAPPPARAM, pAccount->NewMailN.AppParam);
+			SetDlgItemInt(m_hwnd, IDC_EDITPORT, pAccount->Server->Port, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITINTERVAL, pAccount->Interval / 60, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITPOPS, pAccount->NewMailN.PopupTime, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITNPOPS, pAccount->NoNewMailN.PopupTime, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITFPOPS, pAccount->BadConnectN.PopupTime, FALSE);
+			for (i = 0; i <= CPLENSUPP; i++)
+				if ((i < CPLENSUPP) && (CodePageNamesSupp[i].CP == pAccount->CP)) {
+					SendDlgItemMessage(m_hwnd, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)i, 0);
+					break;
+				}
+
+			if (i == CPLENSUPP)
+				SendDlgItemMessage(m_hwnd, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)CPDEFINDEX, 0);
+
+			CheckDlgButton(m_hwnd, IDC_CHECK, pAccount->Flags & YAMN_ACC_ENA ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKSND, pAccount->NewMailN.Flags & YAMN_ACC_SND ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKMSG, pAccount->NewMailN.Flags & YAMN_ACC_MSG ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKICO, pAccount->NewMailN.Flags & YAMN_ACC_ICO ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKPOP, pAccount->NewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCOL, pAccount->NewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKAPP, pAccount->NewMailN.Flags & YAMN_ACC_APP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKKBN, pAccount->NewMailN.Flags & YAMN_ACC_KBN ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKNPOP, pAccount->NoNewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKNCOL, pAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKNMSGP, pAccount->NoNewMailN.Flags & YAMN_ACC_MSGP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFSND, pAccount->BadConnectN.Flags & YAMN_ACC_SND ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFMSG, pAccount->BadConnectN.Flags & YAMN_ACC_MSG ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFICO, pAccount->BadConnectN.Flags & YAMN_ACC_ICO ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFPOP, pAccount->BadConnectN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFCOL, pAccount->BadConnectN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOPN, pAccount->Flags & YAMN_ACC_POPN ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOP1, pAccount->Flags & YAMN_ACC_POPN ? BST_UNCHECKED : BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKSSL, pAccount->Flags & YAMN_ACC_SSL23 ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKNOTLS, pAccount->Flags & YAMN_ACC_NOTLS ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKAPOP, pAccount->Flags & YAMN_ACC_APOP ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_AUTOBODY, pAccount->Flags & YAMN_ACC_BODY ? BST_CHECKED : BST_UNCHECKED);
+
+			Check0 = pAccount->StatusFlags & YAMN_ACC_ST0;
+			Check1 = pAccount->StatusFlags & YAMN_ACC_ST1;
+			Check2 = pAccount->StatusFlags & YAMN_ACC_ST2;
+			Check3 = pAccount->StatusFlags & YAMN_ACC_ST3;
+			Check4 = pAccount->StatusFlags & YAMN_ACC_ST4;
+			Check5 = pAccount->StatusFlags & YAMN_ACC_ST5;
+			Check6 = pAccount->StatusFlags & YAMN_ACC_ST6;
+			Check7 = pAccount->StatusFlags & YAMN_ACC_ST7;
+
+			CheckDlgButton(m_hwnd, IDC_CHECKSTART, pAccount->StatusFlags & YAMN_ACC_STARTS ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFORCE, pAccount->StatusFlags & YAMN_ACC_FORCE ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCONTACT, pAccount->NewMailN.Flags & YAMN_ACC_CONT ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCONTACTNICK, pAccount->NewMailN.Flags & YAMN_ACC_CONTNICK ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCONTACTNOEVENT, pAccount->NewMailN.Flags & YAMN_ACC_CONTNOEVENT ? BST_CHECKED : BST_UNCHECKED);
+
+			wchar_t accstatus[256];
+			GetAccountStatus(pAccount, accstatus);
+			SetDlgItemText(m_hwnd, IDC_STSTATUS, accstatus);
+			ReadDone(pAccount);
 		}
-		break;
-
-	case WM_NOTIFY:
-		switch (((LPNMHDR)lParam)->idFrom) {
-		case 0:
-			switch (((LPNMHDR)lParam)->code) {
-			case PSN_APPLY:
-				g_plugin.setByte(YAMN_SHOWASPROTO, IsDlgButtonChecked(hDlg, IDC_YAMNASPROTO));
-				g_plugin.setByte(YAMN_SHOWMAINMENU, IsDlgButtonChecked(hDlg, IDC_MAINMENU));
-				g_plugin.setByte(YAMN_CLOSEDELETE, IsDlgButtonChecked(hDlg, IDC_CLOSEONDELETE));
-				g_plugin.setByte(YAMN_TTBFCHECK, IsDlgButtonChecked(hDlg, IDC_CHECKTTB));
-
-				AddTopToolbarIcon(0, 0);
-				CheckMenuItems();
-
-				optDateTime = 0;
-				if (IsDlgButtonChecked(hDlg, IDC_LONGDATE))optDateTime |= SHOWDATELONG;
-				if (IsDlgButtonChecked(hDlg, IDC_SMARTDATE))optDateTime |= SHOWDATENOTODAY;
-				if (IsDlgButtonChecked(hDlg, IDC_NOSECONDS))optDateTime |= SHOWDATENOSECONDS;
-				g_plugin.setByte(YAMN_DBTIMEOPTIONS, optDateTime);
-			}
+		else {
+			DlgSetItemText(m_hwnd, IDC_EDITSERVER, nullptr);
+			DlgSetItemText(m_hwnd, IDC_EDITNAME, nullptr);
+			DlgSetItemText(m_hwnd, IDC_EDITLOGIN, nullptr);
+			DlgSetItemText(m_hwnd, IDC_EDITPASS, nullptr);
+			DlgSetItemText(m_hwnd, IDC_EDITAPP, nullptr);
+			DlgSetItemText(m_hwnd, IDC_EDITAPPPARAM, nullptr);
+			DlgSetItemText(m_hwnd, IDC_STTIMELEFT, nullptr);
+			SetDlgItemInt(m_hwnd, IDC_EDITPORT, 110, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITINTERVAL, 30, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITPOPS, 0, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITNPOPS, 0, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITFPOPS, 0, FALSE);
+			SendDlgItemMessage(m_hwnd, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)CPDEFINDEX, 0);
+			CheckDlgButton(m_hwnd, IDC_CHECK, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKSND, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKMSG, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKICO, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKPOP, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCOL, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKAPP, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFSND, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFMSG, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFICO, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFPOP, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFCOL, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKSTART, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKFORCE, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOPN, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOP1, BST_CHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKSSL, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKNOTLS, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKAPOP, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_AUTOBODY, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_CHECKCONTACT, BST_CHECKED);
+
+			SetDlgItemText(m_hwnd, IDC_STSTATUS, TranslateT("No account selected"));
 		}
-		break;
 	}
+};
 
-	return FALSE;
-}
+//=======================================================================================
+// General options dialog
+
+struct CGeneralOptDlg : public CBaseOptionsDlg
+{
+	CGeneralOptDlg() :
+		CBaseOptionsDlg(IDD_YAMNOPT)
+	{}
+
+	bool OnInitDialog() override
+	{
+		CheckDlgButton(m_hwnd, IDC_CHECKTTB, g_plugin.getByte(YAMN_TTBFCHECK, 1) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(m_hwnd, IDC_LONGDATE, (optDateTime & SHOWDATELONG) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(m_hwnd, IDC_SMARTDATE, (optDateTime & SHOWDATENOTODAY) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(m_hwnd, IDC_NOSECONDS, (optDateTime & SHOWDATENOSECONDS) ? BST_CHECKED : BST_UNCHECKED);
+
+		CheckDlgButton(m_hwnd, IDC_MAINMENU, g_plugin.getByte(YAMN_SHOWMAINMENU, 1) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(m_hwnd, IDC_YAMNASPROTO, g_plugin.getByte(YAMN_SHOWASPROTO, 1) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(m_hwnd, IDC_CLOSEONDELETE, g_plugin.getByte(YAMN_CLOSEDELETE, 0) ? BST_CHECKED : BST_UNCHECKED);
+		return true;
+	}
+
+	bool OnApply() override
+	{
+		g_plugin.setByte(YAMN_SHOWASPROTO, IsDlgButtonChecked(m_hwnd, IDC_YAMNASPROTO));
+		g_plugin.setByte(YAMN_SHOWMAINMENU, IsDlgButtonChecked(m_hwnd, IDC_MAINMENU));
+		g_plugin.setByte(YAMN_CLOSEDELETE, IsDlgButtonChecked(m_hwnd, IDC_CLOSEONDELETE));
+		g_plugin.setByte(YAMN_TTBFCHECK, IsDlgButtonChecked(m_hwnd, IDC_CHECKTTB));
+
+		AddTopToolbarIcon(0, 0);
+		CheckMenuItems();
+
+		optDateTime = 0;
+		if (IsDlgButtonChecked(m_hwnd, IDC_LONGDATE)) optDateTime |= SHOWDATELONG;
+		if (IsDlgButtonChecked(m_hwnd, IDC_SMARTDATE)) optDateTime |= SHOWDATENOTODAY;
+		if (IsDlgButtonChecked(m_hwnd, IDC_NOSECONDS)) optDateTime |= SHOWDATENOSECONDS;
+		g_plugin.setByte(YAMN_DBTIMEOPTIONS, optDateTime);
+		return true;
+	}
+};
 
 //--------------------------------------------------------------------------------------------------
 
@@ -84,72 +205,9 @@ static BOOL DlgEnableAccountStatus(HWND hDlg, WPARAM wParam, LPARAM)
 	return TRUE;
 }
 
-static BOOL DlgEnableAccountPopup(HWND hDlg, WPARAM wParam, LPARAM)
-{
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKPOP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKCOL), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPB), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPT), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_RADIOPOPN), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_RADIOPOP1), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKNPOP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITNPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKNCOL), (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPNB), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPNT), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFPOP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITFPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFCOL), (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPFB), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CPFT), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKAPOP), (BOOL)wParam);
-	return TRUE;
-}
-
-static BOOL DlgEnableAccount(HWND hDlg, WPARAM wParam, LPARAM)
+static BOOL DlgShowAccountStatus(HWND hDlg, HPOP3ACCOUNT ActualAccount)
 {
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECK), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITSERVER), wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITNAME), wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITPORT), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITLOGIN), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITPASS), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITINTERVAL), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKSND), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKMSG), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKICO), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKAPP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKKBN), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_BTNAPP), (IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITAPP), (IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_EDITAPPPARAM), (IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKNMSGP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFSND), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFMSG), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFICO), (BOOL)wParam);
-	
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKSTART), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKFORCE), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_COMBOCP), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_STTIMELEFT), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_BTNRESET), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_BTNDEFAULT), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_BTNSTATUS), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKSSL), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKNOTLS), (IsDlgButtonChecked(hDlg, IDC_CHECKSSL) == BST_UNCHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_AUTOBODY), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKCONTACT), (BOOL)wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKCONTACTNICK), (IsDlgButtonChecked(hDlg, IDC_CHECKCONTACT) == BST_CHECKED) && wParam);
-	EnableWindow(GetDlgItem(hDlg, IDC_CHECKCONTACTNOEVENT), (IsDlgButtonChecked(hDlg, IDC_CHECKCONTACT) == BST_CHECKED) && wParam);
-	return TRUE;
-}
-
-static BOOL DlgShowAccountStatus(HWND hDlg, WPARAM wParam, LPARAM lParam)
-{
-	HPOP3ACCOUNT ActualAccount = (HPOP3ACCOUNT)lParam;
-
-	if ((uint32_t)wParam == M_SHOWACTUAL) {
+	if (ActualAccount) {
 		#ifdef DEBUG_SYNCHRO
 			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read wait\n");
 		#endif
@@ -180,233 +238,6 @@ static BOOL DlgShowAccountStatus(HWND hDlg, WPARAM wParam, LPARAM lParam)
 	return TRUE;
 }
 
-static BOOL DlgShowAccountPopup(HWND hDlg, WPARAM wParam, LPARAM lParam)
-{
-	HPOP3ACCOUNT ActualAccount = (HPOP3ACCOUNT)lParam;
-
-	if ((uint32_t)wParam == M_SHOWACTUAL) {
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read wait\n");
-		#endif
-		WaitToRead(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read enter\n");
-		#endif
-		SetDlgItemInt(hDlg, IDC_EDITPOPS, ActualAccount->NewMailN.PopupTime, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITNPOPS, ActualAccount->NoNewMailN.PopupTime, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITFPOPS, ActualAccount->BadConnectN.PopupTime, FALSE);
-
-
-		CheckDlgButton(hDlg, IDC_CHECKPOP, ActualAccount->NewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCOL, ActualAccount->NewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNPOP, ActualAccount->NoNewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNCOL, ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFPOP, ActualAccount->BadConnectN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFCOL, ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOPN, ActualAccount->Flags & YAMN_ACC_POPN ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOP1, ActualAccount->Flags & YAMN_ACC_POPN ? BST_UNCHECKED : BST_CHECKED);
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read done\n");
-		#endif
-		ReadDone(ActualAccount);
-	}
-	else { // default
-		SetDlgItemInt(hDlg, IDC_EDITPOPS, 0, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITNPOPS, 0, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITFPOPS, 0, FALSE);
-		CheckDlgButton(hDlg, IDC_CHECKPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOPN, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOP1, BST_CHECKED);
-	}
-	return TRUE;
-}
-
-static BOOL DlgShowAccount(HWND hDlg, WPARAM wParam, LPARAM lParam)
-{
-	HPOP3ACCOUNT ActualAccount = (HPOP3ACCOUNT)lParam;
-	int i;
-
-	if ((uint32_t)wParam == M_SHOWACTUAL) {
-		wchar_t accstatus[256];
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read wait\n");
-		#endif
-		WaitToRead(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read enter\n");
-		#endif
-		
-		DlgSetItemText(hDlg, IDC_EDITSERVER, ActualAccount->Server->Name);
-		DlgSetItemText(hDlg, IDC_EDITNAME, ActualAccount->Name);
-		DlgSetItemText(hDlg, IDC_EDITLOGIN, ActualAccount->Server->Login);
-		DlgSetItemText(hDlg, IDC_EDITPASS, ActualAccount->Server->Passwd);
-		DlgSetItemTextW(hDlg, IDC_EDITAPP, ActualAccount->NewMailN.App);
-		DlgSetItemTextW(hDlg, IDC_EDITAPPPARAM, ActualAccount->NewMailN.AppParam);
-		SetDlgItemInt(hDlg, IDC_EDITPORT, ActualAccount->Server->Port, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITINTERVAL, ActualAccount->Interval / 60, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITPOPS, ActualAccount->NewMailN.PopupTime, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITNPOPS, ActualAccount->NoNewMailN.PopupTime, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITFPOPS, ActualAccount->BadConnectN.PopupTime, FALSE);
-		for (i = 0; i <= CPLENSUPP; i++)
-			if ((i < CPLENSUPP) && (CodePageNamesSupp[i].CP == ActualAccount->CP)) {
-				SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)i, 0);
-				break;
-			}
-		
-		if (i == CPLENSUPP)
-			SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)CPDEFINDEX, 0);
-
-		CheckDlgButton(hDlg, IDC_CHECK, ActualAccount->Flags & YAMN_ACC_ENA ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKSND, ActualAccount->NewMailN.Flags & YAMN_ACC_SND ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKMSG, ActualAccount->NewMailN.Flags & YAMN_ACC_MSG ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKICO, ActualAccount->NewMailN.Flags & YAMN_ACC_ICO ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKPOP, ActualAccount->NewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCOL, ActualAccount->NewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKAPP, ActualAccount->NewMailN.Flags & YAMN_ACC_APP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKKBN, ActualAccount->NewMailN.Flags & YAMN_ACC_KBN ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNPOP, ActualAccount->NoNewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNCOL, ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNMSGP, ActualAccount->NoNewMailN.Flags & YAMN_ACC_MSGP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFSND, ActualAccount->BadConnectN.Flags & YAMN_ACC_SND ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFMSG, ActualAccount->BadConnectN.Flags & YAMN_ACC_MSG ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFICO, ActualAccount->BadConnectN.Flags & YAMN_ACC_ICO ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFPOP, ActualAccount->BadConnectN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFCOL, ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOPN, ActualAccount->Flags & YAMN_ACC_POPN ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOP1, ActualAccount->Flags & YAMN_ACC_POPN ? BST_UNCHECKED : BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKSSL, ActualAccount->Flags & YAMN_ACC_SSL23 ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNOTLS, ActualAccount->Flags & YAMN_ACC_NOTLS ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKAPOP, ActualAccount->Flags & YAMN_ACC_APOP ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_AUTOBODY, ActualAccount->Flags & YAMN_ACC_BODY ? BST_CHECKED : BST_UNCHECKED);
-		
-		Check0 = ActualAccount->StatusFlags & YAMN_ACC_ST0;
-		Check1 = ActualAccount->StatusFlags & YAMN_ACC_ST1;
-		Check2 = ActualAccount->StatusFlags & YAMN_ACC_ST2;
-		Check3 = ActualAccount->StatusFlags & YAMN_ACC_ST3;
-		Check4 = ActualAccount->StatusFlags & YAMN_ACC_ST4;
-		Check5 = ActualAccount->StatusFlags & YAMN_ACC_ST5;
-		Check6 = ActualAccount->StatusFlags & YAMN_ACC_ST6;
-		Check7 = ActualAccount->StatusFlags & YAMN_ACC_ST7;
-
-		CheckDlgButton(hDlg, IDC_CHECKSTART, ActualAccount->StatusFlags & YAMN_ACC_STARTS ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFORCE, ActualAccount->StatusFlags & YAMN_ACC_FORCE ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCONTACT, ActualAccount->NewMailN.Flags & YAMN_ACC_CONT ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCONTACTNICK, ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNICK ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCONTACTNOEVENT, ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNOEVENT ? BST_CHECKED : BST_UNCHECKED);
-		#ifdef DEBUG_SYNCHRO
-			DebugLog(SynchroFile, "Options:SHOWACCOUNT:ActualAccountSO-read done\n");
-		#endif
-		GetAccountStatus(ActualAccount, accstatus);
-		SetDlgItemText(hDlg, IDC_STSTATUS, accstatus);
-		ReadDone(ActualAccount);
-	}
-	else {
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITSERVER, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITNAME, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITLOGIN, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITPASS, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITAPP, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_EDITAPPPARAM, nullptr);
-		DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-		SetDlgItemInt(hDlg, IDC_EDITPORT, 110, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITINTERVAL, 30, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITPOPS, 0, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITNPOPS, 0, FALSE);
-		SetDlgItemInt(hDlg, IDC_EDITFPOPS, 0, FALSE);
-		SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)CPDEFINDEX, 0);
-		CheckDlgButton(hDlg, IDC_CHECK, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKSND, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKMSG, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKICO, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKAPP, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFSND, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFMSG, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFICO, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFPOP, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFCOL, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKSTART, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKFORCE, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOPN, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_RADIOPOP1, BST_CHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKSSL, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKNOTLS, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKAPOP, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_AUTOBODY, BST_UNCHECKED);
-		CheckDlgButton(hDlg, IDC_CHECKCONTACT, BST_CHECKED);
-
-		SetDlgItemText(hDlg, IDC_STSTATUS, TranslateT("No account selected"));
-	}
-	return TRUE;
-}
-
-static BOOL DlgShowAccountColors(HWND hDlg, WPARAM, LPARAM lParam)
-{
-	HPOP3ACCOUNT ActualAccount = (HPOP3ACCOUNT)lParam;
-	#ifdef DEBUG_SYNCHRO
-		DebugLog(SynchroFile, "Options:SHOWACCOUNTCOLORS:ActualAccountSO-read wait\n");
-	#endif
-	WaitToRead(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
-	#ifdef DEBUG_SYNCHRO
-		DebugLog(SynchroFile, "Options:SHOWACCOUNTCOLORS:ActualAccountSO-read enter\n");
-	#endif
-	if (ActualAccount->NewMailN.Flags & YAMN_ACC_POPC) {
-		SendDlgItemMessage(hDlg, IDC_CPB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NewMailN.PopupB);
-		SendDlgItemMessage(hDlg, IDC_CPT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NewMailN.PopupT);
-	}
-	else {
-		SendDlgItemMessage(hDlg, IDC_CPB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
-		SendDlgItemMessage(hDlg, IDC_CPT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
-	}
-	if (ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC) {
-		SendDlgItemMessage(hDlg, IDC_CPFB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->BadConnectN.PopupB);
-		SendDlgItemMessage(hDlg, IDC_CPFT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->BadConnectN.PopupT);
-	}
-	else {
-		SendDlgItemMessage(hDlg, IDC_CPFB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
-		SendDlgItemMessage(hDlg, IDC_CPFT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
-	}
-	if (ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC) {
-		SendDlgItemMessage(hDlg, IDC_CPNB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NoNewMailN.PopupB);
-		SendDlgItemMessage(hDlg, IDC_CPNT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NoNewMailN.PopupT);
-	}
-	else {
-		SendDlgItemMessage(hDlg, IDC_CPNB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
-		SendDlgItemMessage(hDlg, IDC_CPNT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
-	}
-	#ifdef DEBUG_SYNCHRO
-		DebugLog(SynchroFile, "Options:SHOWACCOUNTCOLORS:ActualAccountSO-read done\n");
-	#endif
-	ReadDone(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
-	return TRUE;
-}
-
-static BOOL DlgSetItemText(HWND hDlg, WPARAM wParam, const char* str)
-{
-	if (str == nullptr)
-		SetDlgItemTextA(hDlg, wParam, "");
-	else
-		SetDlgItemTextA(hDlg, wParam, str);
-	return TRUE;
-}
-
-static BOOL DlgSetItemTextW(HWND hDlg, WPARAM wParam, const wchar_t* str)
-{
-	if (str == nullptr)
-		SetDlgItemTextW(hDlg, wParam, L"");
-	else
-		SetDlgItemTextW(hDlg, wParam, str);
-	return TRUE;
-}
-
 static INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)
 {
 	static HPOP3ACCOUNT ActualAccount;
@@ -414,7 +245,7 @@ static INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wPar
 	case WM_INITDIALOG:
 		ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput);
 		if (ActualAccount != nullptr) {
-			DlgShowAccountStatus(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
+			DlgShowAccountStatus(hDlg, ActualAccount);
 			DlgEnableAccountStatus(hDlg, TRUE, TRUE);
 		}
 		else {
@@ -456,862 +287,929 @@ static INT_PTR CALLBACK DlgProcPOP3AccStatusOpt(HWND hDlg, UINT msg, WPARAM wPar
 	return FALSE;
 }
 
-static INT_PTR CALLBACK DlgProcPOP3AccOpt(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+/////////////////////////////////////////////////////////////////////////////////////////
+// Account options
+
+class CAccOptDlg : public CBaseOptionsDlg
 {
-	BOOL Changed = FALSE;
 	INT_PTR Result;
-	static BOOL InList = FALSE;
-	static HPOP3ACCOUNT ActualAccount;
-	static UCHAR ActualStatus;
-	//	static struct CPOP3Options POP3Options;
+	bool InList = false;
+	UCHAR ActualStatus;
+	HPOP3ACCOUNT ActualAccount;
+
+	CCtrlCheck chkContact, chkSsl, chkApp;
+	CCtrlCombo cmbAccount, cmbCP;
+	CCtrlButton btnStatus, btnAdd, btnDel, btnApp, btnDefault, btnReset;
+
+	void DlgEnableAccount(bool bEnable)
+	{
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECK), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITSERVER), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITNAME), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITPORT), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITLOGIN), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITPASS), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITINTERVAL), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKSND), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKMSG), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKICO), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKAPP), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKKBN), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNAPP), chkApp.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITAPP), chkApp.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITAPPPARAM), chkApp.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKNMSGP), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKFSND), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKFMSG), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKFICO), bEnable);
+
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKSTART), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKFORCE), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_COMBOCP), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_STTIMELEFT), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNRESET), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEFAULT), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNSTATUS), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKSSL), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKAPOP), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKNOTLS), chkSsl.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_AUTOBODY), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKCONTACT), bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKCONTACTNICK), chkContact.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKCONTACTNOEVENT), chkContact.IsChecked() && bEnable);
+	}
 
-	switch (msg) {
-	case WM_INITDIALOG:
-		{
-			int i;
+public:
+	CAccOptDlg() :
+		CBaseOptionsDlg(IDD_POP3ACCOUNTOPT),
+		cmbCP(this, IDC_COMBOCP),
+		btnAdd(this, IDC_BTNADD),
+		btnApp(this, IDC_BTNAPP),
+		btnDel(this, IDC_BTNDEL),
+		chkApp(this, IDC_CHECKAPP),
+		chkSsl(this, IDC_CHECKSSL),
+		btnReset(this, IDC_BTNRESET),
+		btnStatus(this, IDC_BTNSTATUS),
+		btnDefault(this, IDC_BTNDEFAULT),
+		cmbAccount(this, IDC_COMBOACCOUNT),
+		chkContact(this, IDC_CHECKCONTACT)
+	{
+		cmbCP.OnSelChanged = Callback(this, &CAccOptDlg::onSelChange_CP);
+
+		cmbAccount.OnChange = Callback(this, &CAccOptDlg::onChange_Account);
+		cmbAccount.OnKillFocus = Callback(this, &CAccOptDlg::onKillFocus_Account);
+		cmbAccount.OnSelChanged = Callback(this, &CAccOptDlg::onSelChange_Account);
+
+		chkApp.OnChange = Callback(this, &CAccOptDlg::onChangeApp);
+		chkSsl.OnChange = Callback(this, &CAccOptDlg::onChangeSsl);
+		chkContact.OnChange = Callback(this, &CAccOptDlg::onChangeContact);
+
+		btnAdd.OnClick = Callback(this, &CAccOptDlg::onClick_Add);
+		btnDel.OnClick = Callback(this, &CAccOptDlg::onClick_Del);
+		btnApp.OnClick = Callback(this, &CAccOptDlg::onClick_App);
+		btnReset.OnClick = Callback(this, &CAccOptDlg::onClick_Reset);
+		btnStatus.OnClick = Callback(this, &CAccOptDlg::onClick_Status);
+		btnDefault.OnClick = Callback(this, &CAccOptDlg::onClick_Default);
+	}
 
-			EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), FALSE);
+	bool OnInitDialog() override
+	{
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), FALSE);
+
+		DlgEnableAccount(false);
+		DlgShowAccount(0);
+
+		// Fill accounts
+		WaitToReadSO(POP3Plugin->AccountBrowserSO);
+
+		for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
+			if (ActualAccount->Name != nullptr)
+				cmbAccount.AddStringA(ActualAccount->Name);
+		cmbAccount.Enable(POP3Plugin->FirstAccount != nullptr);
+		ReadDoneSO(POP3Plugin->AccountBrowserSO);
+
+		// Fill code pages
+		cmbCP.AddString(TranslateT("Default"));
+		for (int i = 1; i < CPLENSUPP; i++) {
+			CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[i].CP, 0, &info);
+			size_t len = mir_wstrlen(info.CodePageName + 7);
+			info.CodePageName[len + 6] = 0;
+			cmbCP.AddString(info.CodePageName + 7);
+		}
+		cmbCP.SetCurSel(0);
 
-			DlgEnableAccount(hDlg, FALSE, FALSE);
-			DlgShowAccount(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
+		ActualAccount = nullptr;
+		SendMessage(GetParent(m_hwnd), PSM_UNCHANGED, (WPARAM)m_hwnd, 0);
 
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read wait\n");
-			#endif
-			WaitToReadSO(POP3Plugin->AccountBrowserSO);
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read enter\n");
-			#endif
+		WindowList_Add(pYAMNVar->MessageWnds, m_hwnd);
+		return true;
+	}
 
-			for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
-				if (ActualAccount->Name != nullptr)
-					SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
+	void OnDestroy() override
+	{
+		WindowList_Remove(pYAMNVar->MessageWnds, m_hwnd);
+	}
 
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read done\n");
-			#endif
-			ReadDoneSO(POP3Plugin->AccountBrowserSO);
-			SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_ADDSTRING, 0, (LPARAM)TranslateT("Default"));
-			for (i = 1; i < CPLENSUPP; i++) {
-				CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[i].CP, 0, &info);
-				size_t len = mir_wstrlen(info.CodePageName + 7);
-				info.CodePageName[len + 6] = 0;
-				SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_ADDSTRING, 0, (LPARAM)(info.CodePageName + 7));
+	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override
+	{
+		switch (msg) {
+		case WM_YAMN_CHANGESTATUS:
+			if ((HPOP3ACCOUNT)wParam == ActualAccount) {
+				wchar_t accstatus[256];
+				GetAccountStatus(ActualAccount, accstatus);
+				SetDlgItemText(m_hwnd, IDC_STSTATUS, accstatus);
+				return TRUE;
 			}
+			break;
 
-			SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_SETCURSEL, (WPARAM)CPDEFINDEX, 0);
-			ActualAccount = nullptr;
-			TranslateDialogDefault(hDlg);
-			SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
+		case WM_YAMN_CHANGESTATUSOPTION:
+			NotifyChange();
 			return TRUE;
-		}
 
-	case WM_SHOWWINDOW:
-		if (wParam == FALSE) {
-			WindowList_Remove(pYAMNVar->MessageWnds, hDlg);
-			SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
+		case WM_YAMN_CHANGETIME:
+			if ((HPOP3ACCOUNT)wParam == ActualAccount) {
+				wchar_t Text[256];
+				mir_snwprintf(Text, TranslateT("Time left to next check [s]: %d"), (uint32_t)lParam);
+				SetDlgItemText(m_hwnd, IDC_STTIMELEFT, Text);
+			}
+			return TRUE;
 		}
-		else WindowList_Add(pYAMNVar->MessageWnds, hDlg);
-		return TRUE;
+		return CDlgBase::DlgProc(msg, wParam, lParam);
+	}
 
-	case WM_YAMN_CHANGESTATUS:
-		if ((HPOP3ACCOUNT)wParam == ActualAccount) {
-			wchar_t accstatus[256];
-			GetAccountStatus(ActualAccount, accstatus);
-			SetDlgItemText(hDlg, IDC_STSTATUS, accstatus);
-			return TRUE;
+	void onChange_Account(CCtrlCombo *)
+	{
+		ActualAccount = nullptr;
+		DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+		DlgEnableAccount(0 != GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput)));
+	}
+
+	void onKillFocus_Account(CCtrlCombo *)
+	{
+		GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
+		if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))) {
+			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+			EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), FALSE);
+			DlgEnableAccount(mir_strlen(DlgInput) > 0);
 		}
-		break;
+		else {
+			DlgShowAccount(ActualAccount);
+			DlgEnableAccount(true);
+			EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), TRUE);
+		}
+	}
 
-	case WM_YAMN_CHANGESTATUSOPTION:
-		Changed = TRUE;
-		SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
-		return TRUE;
+	void onSelChange_Account(CCtrlCombo *)
+	{
+		if (CB_ERR != (Result = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0)))
+			SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
 
-	case WM_YAMN_CHANGETIME:
-		if ((HPOP3ACCOUNT)wParam == ActualAccount) {
-			wchar_t Text[256];
-			mir_snwprintf(Text, TranslateT("Time left to next check [s]: %d"), (uint32_t)lParam);
-			SetDlgItemText(hDlg, IDC_STTIMELEFT, Text);
+		if ((Result == CB_ERR) || (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput)))) {
+			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+			EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), FALSE);
 		}
-		return TRUE;
+		else {
+			DlgShowAccount(ActualAccount);
+			DlgEnableAccount(true);
+			EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), TRUE);
+		}
+	}
 
-	case WM_COMMAND:
-		switch (LOWORD(wParam)) {
-		case IDC_COMBOACCOUNT:
-			switch (HIWORD(wParam)) {
-			case CBN_EDITCHANGE:
-				ActualAccount = nullptr;
-				DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-
-				if (GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput)))
-					DlgEnableAccount(hDlg, TRUE, FALSE);
-				else
-					DlgEnableAccount(hDlg, FALSE, FALSE);
-				break;
-
-			case CBN_KILLFOCUS:
-				GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
-				if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))) {
-					DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-					EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), FALSE);
-					if (mir_strlen(DlgInput))
-						DlgEnableAccount(hDlg, TRUE, TRUE);
-					else
-						DlgEnableAccount(hDlg, FALSE, FALSE);
-				}
-				else {
-					DlgShowAccount(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
-					DlgEnableAccount(hDlg, TRUE, TRUE);
-					EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), TRUE);
-				}
-				break;
+	void onSelChange_CP(CCtrlCombo*)
+	{
+		int sel = cmbCP.GetCurSel();
+		CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[sel].CP, 0, &info);
+		DlgSetItemTextW(m_hwnd, IDC_STSTATUS, info.CodePageName);
+	}
 
-			case CBN_SELCHANGE:
-				if (CB_ERR != (Result = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0)))
-					SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
+	void onChangeContact(CCtrlCheck *)
+	{
+		bool bEnabled = chkContact.IsChecked();
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKCONTACTNICK), bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKCONTACTNOEVENT), bEnabled);
+	}
 
-				if ((Result == CB_ERR) || (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput)))) {
-					DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-					EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), FALSE);
-				}
-				else {
-					DlgShowAccount(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
-					DlgEnableAccount(hDlg, TRUE, FALSE);
-					EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), TRUE);
-				}
-				break;
-			}
-			break;
+	void onChangeSsl(CCtrlCheck *)
+	{
+		bool bEnabled = chkSsl.IsChecked();
+		SetDlgItemInt(m_hwnd, IDC_EDITPORT, bEnabled ? 995 : 110, FALSE);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKNOTLS), !bEnabled);
+	}
 
-		case IDC_COMBOCP:
-			{
-				int sel = SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_GETCURSEL, 0, 0);
-				CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[sel].CP, 0, &info);
-				DlgSetItemTextT(hDlg, IDC_STSTATUS, info.CodePageName);
-			}
-		case IDC_CHECK:
-		case IDC_CHECKSND:
-		case IDC_CHECKMSG:
-		case IDC_CHECKICO:
-		case IDC_CHECKFSND:
-		case IDC_CHECKFMSG:
-		case IDC_CHECKFICO:
-		case IDC_CHECKST0:
-		case IDC_CHECKST1:
-		case IDC_CHECKST2:
-		case IDC_CHECKST3:
-		case IDC_CHECKST4:
-		case IDC_CHECKST5:
-		case IDC_CHECKST6:
-		case IDC_CHECKST7:
-		case IDC_CHECKSTART:
-		case IDC_CHECKFORCE:
-		case IDC_EDITAPPPARAM:
-		case IDC_CHECKAPOP:
-		case IDC_AUTOBODY:
-		case IDC_CHECKCONTACTNICK:
-		case IDC_CHECKCONTACTNOEVENT:
-		case IDC_CHECKNOTLS:
-			Changed = TRUE;
-			break;
+	void onChangeApp(CCtrlCheck *)
+	{
+		bool bEnabled = chkApp.IsChecked();
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNAPP), bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITAPP), bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITAPPPARAM), bEnabled);
+	}
 
-		case IDC_CHECKCONTACT:
-			Changed = IsDlgButtonChecked(hDlg, IDC_CHECKCONTACT) == BST_CHECKED;
-			EnableWindow(GetDlgItem(hDlg, IDC_CHECKCONTACTNICK), Changed);
-			EnableWindow(GetDlgItem(hDlg, IDC_CHECKCONTACTNOEVENT), Changed);
-			Changed = TRUE;
-			break;
+	void onClick_Status(CCtrlButton *)
+	{
+		DialogBoxParamW(g_plugin.getInst(), MAKEINTRESOURCEW(IDD_CHOOSESTATUSMODES), m_hwnd, DlgProcPOP3AccStatusOpt, NULL);
+	}
 
-		case IDC_CHECKSSL:
-			{
-				BOOL SSLC = (IsDlgButtonChecked(hDlg, IDC_CHECKSSL) == BST_CHECKED);
-				SetDlgItemInt(hDlg, IDC_EDITPORT, SSLC ? 995 : 110, FALSE);
-				EnableWindow(GetDlgItem(hDlg, IDC_CHECKNOTLS), SSLC ? 0 : 1);
-			}
-			Changed = TRUE;
-			break;
+	void onClick_Add(CCtrlButton *)
+	{
+		DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+		DlgShowAccount(0);
+		DlgEnableAccount(true);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), FALSE);
+		DlgSetItemTextW(m_hwnd, IDC_EDITNAME, TranslateT("New Account"));
+
+		int index = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)TranslateT("New Account"));
+		if (index != CB_ERR && index != CB_ERRSPACE)
+			SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_SETCURSEL, index, (LPARAM)TranslateT("New Account"));
+	}
 
-		case IDC_CPB:
-		case IDC_CPT:
-		case IDC_CPFB:
-		case IDC_CPFT:
-		case IDC_CPNB:
-		case IDC_CPNT:
-			if (HIWORD(wParam) != CPN_COLOURCHANGED)
-				break;
-
-		case IDC_CHECKKBN:
-			Changed = TRUE;
-			break;
+	void onClick_App(CCtrlButton *)
+	{
+		wchar_t filter[MAX_PATH];
+		mir_snwprintf(filter, L"%s (*.exe;*.bat;*.cmd;*.com)%c*.exe;*.bat;*.cmd;*.com%c%s (*.*)%c*.*%c",
+			TranslateT("Executables"), 0, 0, TranslateT("All Files"), 0, 0);
+
+		OPENFILENAME OFNStruct = {0};
+		OFNStruct.lStructSize = sizeof(OPENFILENAME);
+		OFNStruct.hwndOwner = m_hwnd;
+		OFNStruct.lpstrFilter = filter;
+		OFNStruct.nFilterIndex = 1;
+		OFNStruct.nMaxFile = MAX_PATH;
+		OFNStruct.lpstrFile = new wchar_t[MAX_PATH];
+		OFNStruct.lpstrFile[0] = (wchar_t)0;
+		OFNStruct.lpstrTitle = TranslateT("Select executable used for notification");
+		OFNStruct.Flags = OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST | OFN_NOCHANGEDIR;
+		if (!GetOpenFileName(&OFNStruct)) {
+			if (CommDlgExtendedError())
+				MessageBox(m_hwnd, TranslateT("Dialog box error"), TranslateT("Failed"), MB_OK);
+		}
+		else DlgSetItemTextW(m_hwnd, IDC_EDITAPP, OFNStruct.lpstrFile);
+		delete[] OFNStruct.lpstrFile;
+	}
 
-		case IDC_CHECKAPP:
-			Changed = TRUE;
-			EnableWindow(GetDlgItem(hDlg, IDC_BTNAPP), IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED);
-			EnableWindow(GetDlgItem(hDlg, IDC_EDITAPP), IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED);
-			EnableWindow(GetDlgItem(hDlg, IDC_EDITAPPPARAM), IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED);
-			break;
+	void onClick_Default(CCtrlButton *)
+	{
+		DlgShowAccount(0);
+	}
 
-		case IDC_BTNSTATUS:
-			DialogBoxParamW(g_plugin.getInst(), MAKEINTRESOURCEW(IDD_CHOOSESTATUSMODES), hDlg, DlgProcPOP3AccStatusOpt, NULL);
-			break;
+	void onClick_Del(CCtrlButton *)
+	{
+		GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), FALSE);
+		if ((CB_ERR == (Result = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0)))
+			|| (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))))
+			return;
 
-		case IDC_BTNADD:
-			DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-			DlgShowAccount(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
-			DlgEnableAccount(hDlg, TRUE, TRUE);
-			EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), FALSE);
-			DlgSetItemTextT(hDlg, IDC_EDITNAME, TranslateT("New Account"));
-			{
-				int index = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)TranslateT("New Account"));
-				if (index != CB_ERR && index != CB_ERRSPACE)
-					SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_SETCURSEL, index, (LPARAM)TranslateT("New Account"));
-			}
-			break;
+		if (IDOK != MessageBox(m_hwnd, TranslateT("Do you really want to delete this account?"), TranslateT("Delete account confirmation"), MB_OKCANCEL | MB_ICONWARNING))
+			return;
 
-		case IDC_BTNAPP:
-			{
-				wchar_t filter[MAX_PATH];
-				mir_snwprintf(filter, L"%s (*.exe;*.bat;*.cmd;*.com)%c*.exe;*.bat;*.cmd;*.com%c%s (*.*)%c*.*%c",
-					TranslateT("Executables"), 0, 0, TranslateT("All Files"), 0, 0);
-
-				OPENFILENAME OFNStruct = { 0 };
-				OFNStruct.lStructSize = sizeof(OPENFILENAME);
-				OFNStruct.hwndOwner = hDlg;
-				OFNStruct.lpstrFilter = filter;
-				OFNStruct.nFilterIndex = 1;
-				OFNStruct.nMaxFile = MAX_PATH;
-				OFNStruct.lpstrFile = new wchar_t[MAX_PATH];
-				OFNStruct.lpstrFile[0] = (wchar_t)0;
-				OFNStruct.lpstrTitle = TranslateT("Select executable used for notification");
-				OFNStruct.Flags = OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON | OFN_PATHMUSTEXIST | OFN_NOCHANGEDIR;
-				if (!GetOpenFileName(&OFNStruct)) {
-					if (CommDlgExtendedError())
-						MessageBox(hDlg, TranslateT("Dialog box error"), TranslateT("Failed"), MB_OK);
-				}
-				else DlgSetItemTextT(hDlg, IDC_EDITAPP, OFNStruct.lpstrFile);
-				delete[] OFNStruct.lpstrFile;
-			}
-			break;
+		DlgSetItemTextW(m_hwnd, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
 
-		case IDC_BTNDEFAULT:
-			DlgShowAccount(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
-			break;
+		if (ActualAccount->hContact != NULL)
+			db_delete_contact(ActualAccount->hContact);
 
-		case IDC_BTNDEL:
-			GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
-			EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), FALSE);
-			if ((CB_ERR == (Result = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0)))
-				|| (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))))
-				return TRUE;
+		CallService(MS_YAMN_DELETEACCOUNT, (WPARAM)POP3Plugin, (LPARAM)ActualAccount);
 
-			if (IDOK != MessageBox(hDlg, TranslateT("Do you really want to delete this account?"), TranslateT("Delete account confirmation"), MB_OKCANCEL | MB_ICONWARNING))
-				return TRUE;
+		// We can consider our account as deleted.
+		SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_DELETESTRING, Result, 0);
+		DlgSetItemText(m_hwnd, IDC_COMBOACCOUNT, nullptr);
+		DlgEnableAccount(false);
+		DlgShowAccount(0);
+	}
 
-			DlgSetItemTextT(hDlg, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
+	void onClick_Reset(CCtrlButton*)
+	{
+		if (ActualAccount != nullptr)
+			ActualAccount->TimeLeft = ActualAccount->Interval;
+	}
 
-			if (ActualAccount->hContact != NULL)
-				db_delete_contact(ActualAccount->hContact);
+	bool OnApply() override
+	{
+		char  Text[MAX_PATH];
+		wchar_t TextW[MAX_PATH];
+		BOOL Translated, NewAcc = FALSE, Check, CheckMsg, CheckSnd, CheckIco, CheckApp, CheckAPOP;
+		BOOL CheckNMsgP, CheckFMsg, CheckFSnd, CheckFIco;
+		BOOL CheckKBN, CheckContact, CheckContactNick, CheckContactNoEvent;
+		BOOL CheckSSL, CheckABody, CheckNoTLS;
+		//BOOL Check0,Check1,Check2,Check3,Check4,Check5,Check6,Check7,Check8,Check9,
+		BOOL CheckStart, CheckForce;
+		size_t Length, index;
+		UINT Port, Interval;
+
+		if (!GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, Text, _countof(Text)))
+			return false;
+
+		Check = (IsDlgButtonChecked(m_hwnd, IDC_CHECK) == BST_CHECKED);
+		CheckSSL = (IsDlgButtonChecked(m_hwnd, IDC_CHECKSSL) == BST_CHECKED);
+		CheckNoTLS = (IsDlgButtonChecked(m_hwnd, IDC_CHECKNOTLS) == BST_CHECKED);
+		CheckAPOP = (IsDlgButtonChecked(m_hwnd, IDC_CHECKAPOP) == BST_CHECKED);
+
+		CheckABody = (IsDlgButtonChecked(m_hwnd, IDC_AUTOBODY) == BST_CHECKED);
+		CheckMsg = (IsDlgButtonChecked(m_hwnd, IDC_CHECKMSG) == BST_CHECKED);
+		CheckSnd = (IsDlgButtonChecked(m_hwnd, IDC_CHECKSND) == BST_CHECKED);
+		CheckIco = (IsDlgButtonChecked(m_hwnd, IDC_CHECKICO) == BST_CHECKED);
+
+		CheckApp = (IsDlgButtonChecked(m_hwnd, IDC_CHECKAPP) == BST_CHECKED);
+		CheckKBN = (IsDlgButtonChecked(m_hwnd, IDC_CHECKKBN) == BST_CHECKED);
+		CheckContact = (IsDlgButtonChecked(m_hwnd, IDC_CHECKCONTACT) == BST_CHECKED);
+		CheckContactNick = (IsDlgButtonChecked(m_hwnd, IDC_CHECKCONTACTNICK) == BST_CHECKED);
+		CheckContactNoEvent = (IsDlgButtonChecked(m_hwnd, IDC_CHECKCONTACTNOEVENT) == BST_CHECKED);
+
+		CheckFSnd = (IsDlgButtonChecked(m_hwnd, IDC_CHECKFSND) == BST_CHECKED);
+		CheckFMsg = (IsDlgButtonChecked(m_hwnd, IDC_CHECKFMSG) == BST_CHECKED);
+		CheckFIco = (IsDlgButtonChecked(m_hwnd, IDC_CHECKFICO) == BST_CHECKED);
+
+		CheckNMsgP = (IsDlgButtonChecked(m_hwnd, IDC_CHECKNMSGP) == BST_CHECKED);
+
+		Port = GetDlgItemInt(m_hwnd, IDC_EDITPORT, &Translated, FALSE);
+		if (!Translated) {
+			MessageBox(m_hwnd, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
+			SetFocus(GetDlgItem(m_hwnd, IDC_EDITPORT));
+			return false;
+		}
+		Interval = GetDlgItemInt(m_hwnd, IDC_EDITINTERVAL, &Translated, FALSE);
+		if (!Translated) {
+			MessageBox(m_hwnd, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
+			SetFocus(GetDlgItem(m_hwnd, IDC_EDITINTERVAL));
+			return false;
+		}
 
-			CallService(MS_YAMN_DELETEACCOUNT, (WPARAM)POP3Plugin, (LPARAM)ActualAccount);
+		GetDlgItemTextA(m_hwnd, IDC_EDITAPP, Text, _countof(Text));
+		if (CheckApp && !(Length = mir_strlen(Text))) {
+			MessageBox(m_hwnd, TranslateT("Please select application to run"), TranslateT("Input error"), MB_OK);
+			return false;
+		}
 
-			//We can consider our account as deleted.
+		GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, Text, _countof(Text));
+		if (!(Length = mir_strlen(Text))) {
+			GetDlgItemTextA(m_hwnd, IDC_EDITNAME, Text, _countof(Text));
+			if (!(Length = mir_strlen(Text)))
+				return false;
+		}
 
-			SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_DELETESTRING, (WPARAM)Result, 0);
-			DlgSetItemText(hDlg, (WPARAM)IDC_COMBOACCOUNT, nullptr);
-			DlgEnableAccount(hDlg, FALSE, 0);
-			DlgShowAccount(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
-			break;
+		DlgSetItemTextW(m_hwnd, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
+
+		if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)Text))) {
+			NewAcc = TRUE;
+			#ifdef DEBUG_SYNCHRO                    
+			DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write wait\n");
+			#endif                                  
+			WaitToWriteSO(POP3Plugin->AccountBrowserSO);
+			#ifdef DEBUG_SYNCHRO                    
+			DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write enter\n");
+			#endif                                  
+			if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_GETNEXTFREEACCOUNT, (WPARAM)POP3Plugin, (LPARAM)YAMN_ACCOUNTVERSION))) {
+				#ifdef DEBUG_SYNCHRO                    
+				DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write done\n");
+				#endif                                  
+				WriteDoneSO(POP3Plugin->AccountBrowserSO);
+				MessageBox(m_hwnd, TranslateT("Cannot allocate memory space for new account"), TranslateT("Memory error"), MB_OK);
+				return false;
+	}
+		}
+		else {
+			#ifdef DEBUG_SYNCHRO                    
+			DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write wait\n");
+			#endif                                  
+			//We have to get full access to AccountBrowser, so other iterating thrads cannot get new account until new account is right set
+			WaitToWriteSO(POP3Plugin->AccountBrowserSO);
+			#ifdef DEBUG_SYNCHRO                    
+			DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write enter\n");
+			#endif                                  
+		}
+		#ifdef DEBUG_SYNCHRO
+		DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write wait\n");
+		#endif
+		if (WAIT_OBJECT_0 != WaitToWrite(ActualAccount)) {
+			#ifdef DEBUG_SYNCHRO
+			DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write wait failed\n");
+			#endif
+			#ifdef DEBUG_SYNCHRO
+			DebugLog(SynchroFile, "Options:APPLY:ActualBrowserSO-write done\n");
+			#endif
+			WriteDoneSO(POP3Plugin->AccountBrowserSO);
 
-		case IDC_BTNRESET:
-			if (ActualAccount != nullptr)
-				ActualAccount->TimeLeft = ActualAccount->Interval;
-			return 1;
 		}
+		#ifdef DEBUG_SYNCHRO
+		DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write enter\n");
+		#endif
 
-		if (HIWORD(wParam) == EN_CHANGE)
-			Changed = TRUE;
-		break;
-
-	case WM_NOTIFY:
-		if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY) {
-			char  Text[MAX_PATH];
-			wchar_t TextW[MAX_PATH];
-			BOOL Translated, NewAcc = FALSE, Check, CheckMsg, CheckSnd, CheckIco, CheckApp, CheckAPOP;
-			BOOL CheckNMsgP, CheckFMsg, CheckFSnd, CheckFIco;
-			BOOL CheckKBN, CheckContact, CheckContactNick, CheckContactNoEvent;
-			BOOL CheckSSL, CheckABody, CheckNoTLS;
-			//BOOL Check0,Check1,Check2,Check3,Check4,Check5,Check6,Check7,Check8,Check9,
-			BOOL CheckStart, CheckForce;
-			size_t Length, index;
-			UINT Port, Interval;
-
-			if (GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, Text, _countof(Text))) {
-				Check = (IsDlgButtonChecked(hDlg, IDC_CHECK) == BST_CHECKED);
-				CheckSSL = (IsDlgButtonChecked(hDlg, IDC_CHECKSSL) == BST_CHECKED);
-				CheckNoTLS = (IsDlgButtonChecked(hDlg, IDC_CHECKNOTLS) == BST_CHECKED);
-				CheckAPOP = (IsDlgButtonChecked(hDlg, IDC_CHECKAPOP) == BST_CHECKED);
-
-				CheckABody = (IsDlgButtonChecked(hDlg, IDC_AUTOBODY) == BST_CHECKED);
-				CheckMsg = (IsDlgButtonChecked(hDlg, IDC_CHECKMSG) == BST_CHECKED);
-				CheckSnd = (IsDlgButtonChecked(hDlg, IDC_CHECKSND) == BST_CHECKED);
-				CheckIco = (IsDlgButtonChecked(hDlg, IDC_CHECKICO) == BST_CHECKED);
-
-				CheckApp = (IsDlgButtonChecked(hDlg, IDC_CHECKAPP) == BST_CHECKED);
-				CheckKBN = (IsDlgButtonChecked(hDlg, IDC_CHECKKBN) == BST_CHECKED);
-				CheckContact = (IsDlgButtonChecked(hDlg, IDC_CHECKCONTACT) == BST_CHECKED);
-				CheckContactNick = (IsDlgButtonChecked(hDlg, IDC_CHECKCONTACTNICK) == BST_CHECKED);
-				CheckContactNoEvent = (IsDlgButtonChecked(hDlg, IDC_CHECKCONTACTNOEVENT) == BST_CHECKED);
-
-				CheckFSnd = (IsDlgButtonChecked(hDlg, IDC_CHECKFSND) == BST_CHECKED);
-				CheckFMsg = (IsDlgButtonChecked(hDlg, IDC_CHECKFMSG) == BST_CHECKED);
-				CheckFIco = (IsDlgButtonChecked(hDlg, IDC_CHECKFICO) == BST_CHECKED);
-
-				CheckNMsgP = (IsDlgButtonChecked(hDlg, IDC_CHECKNMSGP) == BST_CHECKED);
-
-				Port = GetDlgItemInt(hDlg, IDC_EDITPORT, &Translated, FALSE);
-				if (!Translated) {
-					MessageBox(hDlg, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
-					SetFocus(GetDlgItem(hDlg, IDC_EDITPORT));
-					break;
-				}
-				Interval = GetDlgItemInt(hDlg, IDC_EDITINTERVAL, &Translated, FALSE);
-				if (!Translated) {
-					MessageBox(hDlg, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
-					SetFocus(GetDlgItem(hDlg, IDC_EDITINTERVAL));
-					break;
-				}
+		GetDlgItemTextA(m_hwnd, IDC_EDITNAME, Text, _countof(Text));
+		if (!(Length = mir_strlen(Text)))
+			return false;
+		if (nullptr != ActualAccount->Name)
+			delete[] ActualAccount->Name;
+		ActualAccount->Name = new char[mir_strlen(Text) + 1];
+		mir_strcpy(ActualAccount->Name, Text);
+
+		GetDlgItemTextA(m_hwnd, IDC_EDITSERVER, Text, _countof(Text));
+		if (nullptr != ActualAccount->Server->Name)
+			delete[] ActualAccount->Server->Name;
+		ActualAccount->Server->Name = new char[mir_strlen(Text) + 1];
+		mir_strcpy(ActualAccount->Server->Name, Text);
+
+		GetDlgItemTextA(m_hwnd, IDC_EDITLOGIN, Text, _countof(Text));
+		if (nullptr != ActualAccount->Server->Login)
+			delete[] ActualAccount->Server->Login;
+		ActualAccount->Server->Login = new char[mir_strlen(Text) + 1];
+		mir_strcpy(ActualAccount->Server->Login, Text);
+
+		GetDlgItemTextA(m_hwnd, IDC_EDITPASS, Text, _countof(Text));
+		if (nullptr != ActualAccount->Server->Passwd)
+			delete[] ActualAccount->Server->Passwd;
+		ActualAccount->Server->Passwd = new char[mir_strlen(Text) + 1];
+		mir_strcpy(ActualAccount->Server->Passwd, Text);
+
+		GetDlgItemTextW(m_hwnd, IDC_EDITAPP, TextW, _countof(TextW));
+		if (nullptr != ActualAccount->NewMailN.App)
+			delete[] ActualAccount->NewMailN.App;
+		ActualAccount->NewMailN.App = new wchar_t[mir_wstrlen(TextW) + 1];
+		mir_wstrcpy(ActualAccount->NewMailN.App, TextW);
+
+		GetDlgItemTextW(m_hwnd, IDC_EDITAPPPARAM, TextW, _countof(TextW));
+		if (nullptr != ActualAccount->NewMailN.AppParam)
+			delete[] ActualAccount->NewMailN.AppParam;
+		ActualAccount->NewMailN.AppParam = new wchar_t[mir_wstrlen(TextW) + 1];
+		mir_wstrcpy(ActualAccount->NewMailN.AppParam, TextW);
+
+		ActualAccount->Server->Port = Port;
+		ActualAccount->Interval = Interval * 60;
+
+		if (CB_ERR == (index = SendDlgItemMessage(m_hwnd, IDC_COMBOCP, CB_GETCURSEL, 0, 0)))
+			index = CPDEFINDEX;
+		ActualAccount->CP = CodePageNamesSupp[index].CP;
+
+		if (NewAcc)
+			ActualAccount->TimeLeft = Interval * 60;
+
+		CheckStart = (IsDlgButtonChecked(m_hwnd, IDC_CHECKSTART) == BST_CHECKED);
+		CheckForce = (IsDlgButtonChecked(m_hwnd, IDC_CHECKFORCE) == BST_CHECKED);
+
+		ActualAccount->Flags =
+			(Check ? YAMN_ACC_ENA : 0) |
+			(CheckSSL ? YAMN_ACC_SSL23 : 0) |
+			(CheckNoTLS ? YAMN_ACC_NOTLS : 0) |
+			(CheckAPOP ? YAMN_ACC_APOP : 0) |
+			(CheckABody ? YAMN_ACC_BODY : 0) |
+			(ActualAccount->Flags & YAMN_ACC_POPN);
+
+		ActualAccount->StatusFlags =
+			(Check0 ? YAMN_ACC_ST0 : 0) |
+			(Check1 ? YAMN_ACC_ST1 : 0) |
+			(Check2 ? YAMN_ACC_ST2 : 0) |
+			(Check3 ? YAMN_ACC_ST3 : 0) |
+			(Check4 ? YAMN_ACC_ST4 : 0) |
+			(Check5 ? YAMN_ACC_ST5 : 0) |
+			(Check6 ? YAMN_ACC_ST6 : 0) |
+			(Check7 ? YAMN_ACC_ST7 : 0) |
+			(CheckStart ? YAMN_ACC_STARTS : 0) |
+			(CheckForce ? YAMN_ACC_FORCE : 0);
+
+		ActualAccount->NewMailN.Flags =
+			(CheckSnd ? YAMN_ACC_SND : 0) |
+			(CheckMsg ? YAMN_ACC_MSG : 0) |
+			(CheckIco ? YAMN_ACC_ICO : 0) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_POP) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_POPC) |
+			(CheckApp ? YAMN_ACC_APP : 0) |
+			(CheckKBN ? YAMN_ACC_KBN : 0) |
+			(CheckContact ? YAMN_ACC_CONT : 0) |
+			(CheckContactNick ? YAMN_ACC_CONTNICK : 0) |
+			(CheckContactNoEvent ? YAMN_ACC_CONTNOEVENT : 0) |
+			YAMN_ACC_MSGP;			//this is default: when new mail arrives and window was displayed, leave it displayed.
+
+		ActualAccount->NoNewMailN.Flags =
+			(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POP) |
+			(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC) |
+			(CheckNMsgP ? YAMN_ACC_MSGP : 0);
+
+		ActualAccount->BadConnectN.Flags =
+			(CheckFSnd ? YAMN_ACC_SND : 0) |
+			(CheckFMsg ? YAMN_ACC_MSG : 0) |
+			(CheckFIco ? YAMN_ACC_ICO : 0) |
+			(ActualAccount->BadConnectN.Flags & YAMN_ACC_POP) |
+			(ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC);
+
+		WriteDone(ActualAccount);
+		WriteDoneSO(POP3Plugin->AccountBrowserSO);
+
+		EnableWindow(GetDlgItem(m_hwnd, IDC_BTNDEL), TRUE);
+
+		DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+
+		index = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
+
+		HPOP3ACCOUNT temp = ActualAccount;
+
+		SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_RESETCONTENT, 0, 0);
+		if (POP3Plugin->FirstAccount != nullptr)
+			for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
+				if (ActualAccount->Name != nullptr)
+					SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
 
-				GetDlgItemTextA(hDlg, IDC_EDITAPP, Text, _countof(Text));
-				if (CheckApp && !(Length = mir_strlen(Text))) {
-					MessageBox(hDlg, TranslateT("Please select application to run"), TranslateT("Input error"), MB_OK);
-					break;
-				}
+		ActualAccount = temp;
+		SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_SETCURSEL, (WPARAM)index, (LPARAM)ActualAccount->Name);
 
-				GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, Text, _countof(Text));
-				if (!(Length = mir_strlen(Text))) {
-					GetDlgItemTextA(hDlg, IDC_EDITNAME, Text, _countof(Text));
-					if (!(Length = mir_strlen(Text)))
-						break;
-				}
+		WritePOP3Accounts();
+		RefreshContact();
+		return TRUE;
+	}
+};
 
-				DlgSetItemTextT(hDlg, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
-
-				if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)Text))) {
-					NewAcc = TRUE;
-					#ifdef DEBUG_SYNCHRO                    
-						DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write wait\n");
-					#endif                                  
-					WaitToWriteSO(POP3Plugin->AccountBrowserSO);
-					#ifdef DEBUG_SYNCHRO                    
-						DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write enter\n");
-					#endif                                  
-					if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_GETNEXTFREEACCOUNT, (WPARAM)POP3Plugin, (LPARAM)YAMN_ACCOUNTVERSION))) {
-						#ifdef DEBUG_SYNCHRO                    
-							DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write done\n");
-						#endif                                  
-						WriteDoneSO(POP3Plugin->AccountBrowserSO);
-						MessageBox(hDlg, TranslateT("Cannot allocate memory space for new account"), TranslateT("Memory error"), MB_OK);
-						break;
-					}
-				}
-				else {
-					#ifdef DEBUG_SYNCHRO                    
-						DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write wait\n");
-					#endif                                  
-					//We have to get full access to AccountBrowser, so other iterating thrads cannot get new account until new account is right set
-					WaitToWriteSO(POP3Plugin->AccountBrowserSO);
-					#ifdef DEBUG_SYNCHRO                    
-						DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write enter\n");
-					#endif                                  
-				}
-				#ifdef DEBUG_SYNCHRO
-					DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write wait\n");
-				#endif
-				if (WAIT_OBJECT_0 != WaitToWrite(ActualAccount)) {
-					#ifdef DEBUG_SYNCHRO
-						DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write wait failed\n");
-					#endif
-					#ifdef DEBUG_SYNCHRO
-						DebugLog(SynchroFile, "Options:APPLY:ActualBrowserSO-write done\n");
-					#endif
-					WriteDoneSO(POP3Plugin->AccountBrowserSO);
+/////////////////////////////////////////////////////////////////////////////////////////
+// Popup options
 
-				}
-				#ifdef DEBUG_SYNCHRO
-					DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write enter\n");
-				#endif
+class CPopupOptsDlg : public CBaseOptionsDlg
+{
+	BOOL InList = FALSE;
+	HPOP3ACCOUNT ActualAccount;
+	UCHAR ActualStatus;
+
+	CCtrlCombo cmbAccount, cmbCP;
+	CCtrlCheck chkCol, chkFcol, chkNcol, chkPop, chkFpop, chkNpop;
+	CCtrlButton btnPreview;
+
+	void DlgShowAccountPopup()
+	{
+		if (ActualAccount) {
+			WaitToRead(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
+			SetDlgItemInt(m_hwnd, IDC_EDITPOPS, ActualAccount->NewMailN.PopupTime, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITNPOPS, ActualAccount->NoNewMailN.PopupTime, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITFPOPS, ActualAccount->BadConnectN.PopupTime, FALSE);
+
+			chkPop.SetState(ActualAccount->NewMailN.Flags & YAMN_ACC_POP);
+			chkCol.SetState(ActualAccount->NewMailN.Flags & YAMN_ACC_POPC);
+			chkNpop.SetState(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POP);
+			chkNcol.SetState(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC);
+			chkFpop.SetState(ActualAccount->BadConnectN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
+			chkFcol.SetState(ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOPN, ActualAccount->Flags & YAMN_ACC_POPN ? BST_CHECKED : BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOP1, ActualAccount->Flags & YAMN_ACC_POPN ? BST_UNCHECKED : BST_CHECKED);
+			ReadDone(ActualAccount);
+		}
+		else { // default
+			SetDlgItemInt(m_hwnd, IDC_EDITPOPS, 0, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITNPOPS, 0, FALSE);
+			SetDlgItemInt(m_hwnd, IDC_EDITFPOPS, 0, FALSE);
+			chkPop.SetState(true);
+			chkCol.SetState(true);
+			chkNpop.SetState(true);
+			chkNcol.SetState(true);
+			chkFpop.SetState(true);
+			chkFcol.SetState(true);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOPN, BST_UNCHECKED);
+			CheckDlgButton(m_hwnd, IDC_RADIOPOP1, BST_CHECKED);
+		}
+	}
 
-				GetDlgItemTextA(hDlg, IDC_EDITNAME, Text, _countof(Text));
-				if (!(Length = mir_strlen(Text)))
-					break;
-				if (nullptr != ActualAccount->Name)
-					delete[] ActualAccount->Name;
-				ActualAccount->Name = new char[mir_strlen(Text) + 1];
-				mir_strcpy(ActualAccount->Name, Text);
-
-				GetDlgItemTextA(hDlg, IDC_EDITSERVER, Text, _countof(Text));
-				if (nullptr != ActualAccount->Server->Name)
-					delete[] ActualAccount->Server->Name;
-				ActualAccount->Server->Name = new char[mir_strlen(Text) + 1];
-				mir_strcpy(ActualAccount->Server->Name, Text);
-
-				GetDlgItemTextA(hDlg, IDC_EDITLOGIN, Text, _countof(Text));
-				if (nullptr != ActualAccount->Server->Login)
-					delete[] ActualAccount->Server->Login;
-				ActualAccount->Server->Login = new char[mir_strlen(Text) + 1];
-				mir_strcpy(ActualAccount->Server->Login, Text);
-
-				GetDlgItemTextA(hDlg, IDC_EDITPASS, Text, _countof(Text));
-				if (nullptr != ActualAccount->Server->Passwd)
-					delete[] ActualAccount->Server->Passwd;
-				ActualAccount->Server->Passwd = new char[mir_strlen(Text) + 1];
-				mir_strcpy(ActualAccount->Server->Passwd, Text);
-
-				GetDlgItemTextW(hDlg, IDC_EDITAPP, TextW, _countof(TextW));
-				if (nullptr != ActualAccount->NewMailN.App)
-					delete[] ActualAccount->NewMailN.App;
-				ActualAccount->NewMailN.App = new wchar_t[mir_wstrlen(TextW) + 1];
-				mir_wstrcpy(ActualAccount->NewMailN.App, TextW);
-
-				GetDlgItemTextW(hDlg, IDC_EDITAPPPARAM, TextW, _countof(TextW));
-				if (nullptr != ActualAccount->NewMailN.AppParam)
-					delete[] ActualAccount->NewMailN.AppParam;
-				ActualAccount->NewMailN.AppParam = new wchar_t[mir_wstrlen(TextW) + 1];
-				mir_wstrcpy(ActualAccount->NewMailN.AppParam, TextW);
-
-				ActualAccount->Server->Port = Port;
-				ActualAccount->Interval = Interval * 60;
-
-				if (CB_ERR == (index = SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_GETCURSEL, 0, 0)))
-					index = CPDEFINDEX;
-				ActualAccount->CP = CodePageNamesSupp[index].CP;
-
-				if (NewAcc)
-					ActualAccount->TimeLeft = Interval * 60;
-
-				CheckStart = (IsDlgButtonChecked(hDlg, IDC_CHECKSTART) == BST_CHECKED);
-				CheckForce = (IsDlgButtonChecked(hDlg, IDC_CHECKFORCE) == BST_CHECKED);
-
-				ActualAccount->Flags =
-					(Check ? YAMN_ACC_ENA : 0) |
-					(CheckSSL ? YAMN_ACC_SSL23 : 0) |
-					(CheckNoTLS ? YAMN_ACC_NOTLS : 0) |
-					(CheckAPOP ? YAMN_ACC_APOP : 0) |
-					(CheckABody ? YAMN_ACC_BODY : 0) |
-					(ActualAccount->Flags & YAMN_ACC_POPN);
-
-				ActualAccount->StatusFlags =
-					(Check0 ? YAMN_ACC_ST0 : 0) |
-					(Check1 ? YAMN_ACC_ST1 : 0) |
-					(Check2 ? YAMN_ACC_ST2 : 0) |
-					(Check3 ? YAMN_ACC_ST3 : 0) |
-					(Check4 ? YAMN_ACC_ST4 : 0) |
-					(Check5 ? YAMN_ACC_ST5 : 0) |
-					(Check6 ? YAMN_ACC_ST6 : 0) |
-					(Check7 ? YAMN_ACC_ST7 : 0) |
-					(CheckStart ? YAMN_ACC_STARTS : 0) |
-					(CheckForce ? YAMN_ACC_FORCE : 0);
-
-				ActualAccount->NewMailN.Flags =
-					(CheckSnd ? YAMN_ACC_SND : 0) |
-					(CheckMsg ? YAMN_ACC_MSG : 0) |
-					(CheckIco ? YAMN_ACC_ICO : 0) |
-					(ActualAccount->NewMailN.Flags & YAMN_ACC_POP) |
-					(ActualAccount->NewMailN.Flags & YAMN_ACC_POPC) |
-					(CheckApp ? YAMN_ACC_APP : 0) |
-					(CheckKBN ? YAMN_ACC_KBN : 0) |
-					(CheckContact ? YAMN_ACC_CONT : 0) |
-					(CheckContactNick ? YAMN_ACC_CONTNICK : 0) |
-					(CheckContactNoEvent ? YAMN_ACC_CONTNOEVENT : 0) |
-					YAMN_ACC_MSGP;			//this is default: when new mail arrives and window was displayed, leave it displayed.
-
-				ActualAccount->NoNewMailN.Flags =
-					(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POP) |
-					(ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC) |
-					(CheckNMsgP ? YAMN_ACC_MSGP : 0);
-
-				ActualAccount->BadConnectN.Flags =
-					(CheckFSnd ? YAMN_ACC_SND : 0) |
-					(CheckFMsg ? YAMN_ACC_MSG : 0) |
-					(CheckFIco ? YAMN_ACC_ICO : 0) |
-					(ActualAccount->BadConnectN.Flags & YAMN_ACC_POP) |
-					(ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC);
-
-				#ifdef DEBUG_SYNCHRO
-					DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write done\n");
-				#endif
-				WriteDone(ActualAccount);
-				#ifdef DEBUG_SYNCHRO                    
-					DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write done\n");
-				#endif                                  
-				WriteDoneSO(POP3Plugin->AccountBrowserSO);
+	void DlgEnableAccountPopup(bool bEnable)
+	{
+		chkPop.Enable(bEnable);
+		chkCol.Enable(chkPop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITPOPS), chkPop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPB), chkCol.IsChecked() && chkPop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPT), chkCol.IsChecked() && chkPop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_RADIOPOPN), chkPop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_RADIOPOP1), chkPop.IsChecked() && bEnable);
+
+		chkNpop.Enable(bEnable);
+		chkNcol.Enable(chkNpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITNPOPS), chkNpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNB), chkNcol.IsChecked() && chkNpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNT), chkNcol.IsChecked() && chkNpop.IsChecked() && bEnable);
+
+		chkFpop.Enable(bEnable);
+		chkFcol.Enable(chkFpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITFPOPS), chkFpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFB), chkFcol.IsChecked() && chkFpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFT), chkFcol.IsChecked() && chkFpop.IsChecked() && bEnable);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CHECKAPOP), bEnable);
+	}
 
-				EnableWindow(GetDlgItem(hDlg, IDC_BTNDEL), TRUE);
+	void DlgShowAccountColors()
+	{
+		WaitToRead(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
 
-				DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
+		if (ActualAccount->NewMailN.Flags & YAMN_ACC_POPC) {
+			SendDlgItemMessage(m_hwnd, IDC_CPB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NewMailN.PopupB);
+			SendDlgItemMessage(m_hwnd, IDC_CPT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NewMailN.PopupT);
+		}
+		else {
+			SendDlgItemMessage(m_hwnd, IDC_CPB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
+			SendDlgItemMessage(m_hwnd, IDC_CPT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
+		}
+		if (ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC) {
+			SendDlgItemMessage(m_hwnd, IDC_CPFB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->BadConnectN.PopupB);
+			SendDlgItemMessage(m_hwnd, IDC_CPFT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->BadConnectN.PopupT);
+		}
+		else {
+			SendDlgItemMessage(m_hwnd, IDC_CPFB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
+			SendDlgItemMessage(m_hwnd, IDC_CPFT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
+		}
+		if (ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC) {
+			SendDlgItemMessage(m_hwnd, IDC_CPNB, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NoNewMailN.PopupB);
+			SendDlgItemMessage(m_hwnd, IDC_CPNT, CPM_SETCOLOUR, 0, (LPARAM)ActualAccount->NoNewMailN.PopupT);
+		}
+		else {
+			SendDlgItemMessage(m_hwnd, IDC_CPNB, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_BTNFACE));
+			SendDlgItemMessage(m_hwnd, IDC_CPNT, CPM_SETCOLOUR, 0, (LPARAM)GetSysColor(COLOR_WINDOWTEXT));
+		}
 
-				index = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
+		ReadDone(ActualAccount);		//we do not need to check if account is deleted. It is not deleted, because only thread that can delete account is this thread
+	}
 
-				HPOP3ACCOUNT temp = ActualAccount;
+public:
+	CPopupOptsDlg() :
+		CBaseOptionsDlg(IDD_POP3ACCOUNTPOPUP),
+		cmbCP(this, IDC_COMBOCP),
+		chkCol(this, IDC_CHECKCOL),
+		chkPop(this, IDC_CHECKPOP),
+		chkFcol(this, IDC_CHECKFCOL),
+		chkFpop(this, IDC_CHECKFPOP),
+		chkNcol(this, IDC_CHECKNCOL),
+		chkNpop(this, IDC_CHECKNPOP),
+		btnPreview(this, IDC_PREVIEW),
+		cmbAccount(this, IDC_COMBOACCOUNT)
+	{
+		chkPop.OnChange = Callback(this, &CPopupOptsDlg::onChange_Pop);
+		chkFpop.OnChange = Callback(this, &CPopupOptsDlg::onChange_Fpop);
+		chkNpop.OnChange = Callback(this, &CPopupOptsDlg::onChange_Npop);
+		chkCol.OnChange = chkFcol.OnChange = chkNcol.OnChange = Callback(this, &CPopupOptsDlg::onChange_Col);
+
+		cmbCP.OnSelChanged = Callback(this, &CPopupOptsDlg::onSelChange_CP);
+
+		btnPreview.OnClick = Callback(this, &CPopupOptsDlg::onClick_Preview);
+
+		cmbAccount.OnKillFocus = Callback(this, &CPopupOptsDlg::onKillFocus_Account);
+		cmbAccount.OnSelChanged = Callback(this, &CPopupOptsDlg::onSelChange_Account);
+	}
 
-				SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_RESETCONTENT, 0, 0);
-				if (POP3Plugin->FirstAccount != nullptr)
-					for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
-						if (ActualAccount->Name != nullptr)
-							SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
+	bool OnInitDialog() override
+	{
+		DlgEnableAccountPopup(false);
+		DlgShowAccountPopup();
 
-				ActualAccount = temp;
-				SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_SETCURSEL, (WPARAM)index, (LPARAM)ActualAccount->Name);
+		WaitToReadSO(POP3Plugin->AccountBrowserSO);
 
-				WritePOP3Accounts();
-				RefreshContact();
-				return TRUE;
-			}
-		}
-		break;
-	}
-	if (Changed)
-		SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
-	return FALSE;
-}
+		if (POP3Plugin->FirstAccount != nullptr)
+			for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
+				if (ActualAccount->Name != nullptr)
+					SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
 
-static INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	BOOL Changed = FALSE;
-	static BOOL InList = FALSE;
-	static HPOP3ACCOUNT ActualAccount;
-	static UCHAR ActualStatus;
-	//	static struct CPOP3Options POP3Options;
+		ReadDoneSO(POP3Plugin->AccountBrowserSO);
+		ActualAccount = nullptr;
 
-	switch (msg) {
-	case WM_INITDIALOG:
-		{
-			DlgEnableAccountPopup(hDlg, FALSE, FALSE);
-			DlgShowAccountPopup(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
-			//DlgShowAccountColors(hDlg,0,(LPARAM)ActualAccount);
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read wait\n");
-			#endif
-			WaitToReadSO(POP3Plugin->AccountBrowserSO);
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read enter\n");
-			#endif
-			if (POP3Plugin->FirstAccount != nullptr)
-				for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
-					if (ActualAccount->Name != nullptr)
-						SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
-			#ifdef DEBUG_SYNCHRO
-				DebugLog(SynchroFile, "Options:INITDIALOG:AccountBrowserSO-read done\n");
-			#endif
-			ReadDoneSO(POP3Plugin->AccountBrowserSO);
-			ActualAccount = nullptr;
+		WindowList_Add(pYAMNVar->MessageWnds, m_hwnd);
 
+		int index = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
+		HPOP3ACCOUNT temp = ActualAccount;
+		SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_RESETCONTENT, 0, 0);
 
-			TranslateDialogDefault(hDlg);
-			SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
-			return TRUE;
+		if (POP3Plugin->FirstAccount != nullptr)
+			for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
+				if (ActualAccount->Name != nullptr)
+					SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
+
+		ActualAccount = temp;
+
+		if (ActualAccount != nullptr) {
+			SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_SETCURSEL, (WPARAM)index, (LPARAM)ActualAccount->Name);
+			DlgShowAccount(ActualAccount);
+			DlgShowAccountColors();
+			DlgEnableAccountPopup(true);
 		}
+		else {
+			DlgShowAccountPopup();
+			DlgEnableAccountPopup(false);
+		}
+		return true;
+	}
+
+	void OnDestroy() override
+	{
+		WindowList_Remove(pYAMNVar->MessageWnds, m_hwnd);
+	}
 
-	case WM_SHOWWINDOW:
-		if ((BOOL)wParam == FALSE) {
-			WindowList_Remove(pYAMNVar->MessageWnds, hDlg);
-			SendMessage(GetParent(hDlg), PSM_UNCHANGED, (WPARAM)hDlg, 0);
+	void onKillFocus_Account(CCtrlCombo *)
+	{
+		GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
+		if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))) {
+			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+			if (mir_strlen(DlgInput))
+				DlgEnableAccountPopup(true);
+			else
+				DlgEnableAccountPopup(false);
 		}
 		else {
-			WindowList_Add(pYAMNVar->MessageWnds, hDlg);
+			DlgShowAccount(ActualAccount);
+			DlgShowAccountColors();
+			DlgEnableAccountPopup(true);
+		}
+	}
 
-			int index = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
-			HPOP3ACCOUNT temp = ActualAccount;
-			SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_RESETCONTENT, 0, 0);
+	void onSelChange_Account(CCtrlCombo *)
+	{
+		int Result = SendDlgItemMessage(m_hwnd, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0);
+		if (CB_ERR != Result)
+			SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
+		if ((Result == CB_ERR) || (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput)))) {
+			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+		}
+		else {
+			DlgShowAccount(ActualAccount);
+			DlgShowAccountColors();
+			DlgEnableAccountPopup(true);
+		}
+	}
 
-			if (POP3Plugin->FirstAccount != nullptr)
-				for (ActualAccount = (HPOP3ACCOUNT)POP3Plugin->FirstAccount; ActualAccount != nullptr; ActualAccount = (HPOP3ACCOUNT)ActualAccount->Next)
-					if (ActualAccount->Name != nullptr)
-						SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_ADDSTRING, 0, (LPARAM)ActualAccount->Name);
+	void onSelChange_CP(CCtrlCombo *)
+	{
+		int sel = SendDlgItemMessage(m_hwnd, IDC_COMBOCP, CB_GETCURSEL, 0, 0);
+		CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[sel].CP, 0, &info);
+		DlgSetItemTextW(m_hwnd, IDC_STSTATUS, info.CodePageName);
+	}
 
-			ActualAccount = temp;
+	void onChange_Col(CCtrlCheck *)
+	{
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPB), chkCol.IsChecked() && chkPop.IsChecked());
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPT), chkCol.IsChecked() && chkPop.IsChecked());
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNB), chkNcol.IsChecked() && chkNpop.IsChecked());
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNT), chkNcol.IsChecked() && chkNpop.IsChecked());
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFB), chkFcol.IsChecked() && chkFpop.IsChecked());
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFT), chkFcol.IsChecked() && chkFpop.IsChecked());
+	}
 
-			if (ActualAccount != nullptr) {
-				SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_SETCURSEL, (WPARAM)index, (LPARAM)ActualAccount->Name);
-				DlgShowAccount(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
-				DlgShowAccountColors(hDlg, 0, (LPARAM)ActualAccount);
-				DlgEnableAccountPopup(hDlg, TRUE, FALSE);
+	void onClick_Preview(CCtrlButton *)
+	{
+		if (chkPop.IsChecked()) {
+			POPUPDATAW Tester = {};
+			Tester.lchIcon = g_plugin.getIcon(IDI_NEWMAIL);
+			mir_wstrncpy(Tester.lpwzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);
+			mir_wstrncpy(Tester.lpwzText, TranslateT("You have N new mail messages"), MAX_SECONDLINE);
+			if (chkCol.IsChecked()) {
+				Tester.colorBack = SendDlgItemMessage(m_hwnd, IDC_CPB, CPM_GETCOLOUR, 0, 0);
+				Tester.colorText = SendDlgItemMessage(m_hwnd, IDC_CPT, CPM_GETCOLOUR, 0, 0);
 			}
 			else {
-				DlgShowAccountPopup(hDlg, (WPARAM)M_SHOWDEFAULT, 0);
-				DlgEnableAccountPopup(hDlg, FALSE, FALSE);
+				Tester.colorBack = GetSysColor(COLOR_BTNFACE);
+				Tester.colorText = GetSysColor(COLOR_WINDOWTEXT);
 			}
+			PUAddPopupW(&Tester);
+		}
 
+		if (chkFpop.IsChecked()) {
+			POPUPDATAW TesterF = {};
+			TesterF.lchIcon = g_plugin.getIcon(IDI_BADCONNECT);
+			mir_wstrncpy(TesterF.lpwzContactName, TranslateT("Account Test (failed)"), MAX_CONTACTNAME);
+			mir_wstrncpy(TesterF.lpwzText, TranslateT("Connection failed message"), MAX_SECONDLINE);
+			if (chkFcol.IsChecked()) {
+				TesterF.colorBack = SendDlgItemMessage(m_hwnd, IDC_CPFB, CPM_GETCOLOUR, 0, 0);
+				TesterF.colorText = SendDlgItemMessage(m_hwnd, IDC_CPFT, CPM_GETCOLOUR, 0, 0);
+			}
+			else {
+				TesterF.colorBack = GetSysColor(COLOR_BTNFACE);
+				TesterF.colorText = GetSysColor(COLOR_WINDOWTEXT);
+			}
+			PUAddPopupW(&TesterF);
 		}
-		return TRUE;
 
-	case WM_COMMAND:
-		{
-			uint16_t wNotifyCode = HIWORD(wParam);
-			switch (LOWORD(wParam)) {
-				LONG Result;
-			case IDC_COMBOACCOUNT:
-				switch (wNotifyCode) {
-
-				case CBN_KILLFOCUS:
-					GetDlgItemTextA(hDlg, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
-					if (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput))) {
-						DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-						if (mir_strlen(DlgInput))
-							DlgEnableAccountPopup(hDlg, TRUE, TRUE);
-						else
-							DlgEnableAccountPopup(hDlg, FALSE, FALSE);
-					}
-					else {
-						DlgShowAccount(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
-						DlgShowAccountColors(hDlg, 0, (LPARAM)ActualAccount);
-						DlgEnableAccountPopup(hDlg, TRUE, TRUE);
-					}
-					break;
-				case CBN_SELCHANGE:
-					if (CB_ERR != (Result = SendDlgItemMessage(hDlg, IDC_COMBOACCOUNT, CB_GETCURSEL, 0, 0)))
-						SendDlgItemMessageA(hDlg, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
-					if ((Result == CB_ERR) || (nullptr == (ActualAccount = (HPOP3ACCOUNT)CallService(MS_YAMN_FINDACCOUNTBYNAME, (WPARAM)POP3Plugin, (LPARAM)DlgInput)))) {
-						DlgSetItemText(hDlg, (WPARAM)IDC_STTIMELEFT, nullptr);
-					}
-					else {
-						DlgShowAccount(hDlg, (WPARAM)M_SHOWACTUAL, (LPARAM)ActualAccount);
-						DlgShowAccountColors(hDlg, 0, (LPARAM)ActualAccount);
-						DlgEnableAccountPopup(hDlg, TRUE, FALSE);
-					}
-					break;
-				}
-				break;
-			case IDC_COMBOCP:
-				{
-					int sel = SendDlgItemMessage(hDlg, IDC_COMBOCP, CB_GETCURSEL, 0, 0);
-					CPINFOEX info; GetCPInfoEx(CodePageNamesSupp[sel].CP, 0, &info);
-					DlgSetItemTextT(hDlg, IDC_STSTATUS, info.CodePageName);
-				}
-			case IDC_RADIOPOPN:
-			case IDC_RADIOPOP1:
-				Changed = TRUE;
-				break;
-
-			case IDC_CPB:
-			case IDC_CPT:
-			case IDC_CPFB:
-			case IDC_CPFT:
-			case IDC_CPNB:
-			case IDC_CPNT:
-				if (HIWORD(wParam) != CPN_COLOURCHANGED)
-					break;
+		if (chkNpop.IsChecked()) {
+			POPUPDATAW TesterN = {};
+			TesterN.lchIcon = g_plugin.getIcon(IDI_LAUNCHAPP);
+			mir_wstrncpy(TesterN.lpwzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);
+			mir_wstrncpy(TesterN.lpwzText, TranslateT("No new mail message"), MAX_SECONDLINE);
+			if (chkNcol.IsChecked()) {
+				TesterN.colorBack = SendDlgItemMessage(m_hwnd, IDC_CPNB, CPM_GETCOLOUR, 0, 0);
+				TesterN.colorText = SendDlgItemMessage(m_hwnd, IDC_CPNT, CPM_GETCOLOUR, 0, 0);
+			}
+			else {
+				TesterN.colorBack = GetSysColor(COLOR_BTNFACE);
+				TesterN.colorText = GetSysColor(COLOR_WINDOWTEXT);
+			}
+			PUAddPopupW(&TesterN);
+		}
+	}
 
-			case IDC_CHECKCOL:
-			case IDC_CHECKFCOL:
-			case IDC_CHECKNCOL:
-				EnableWindow(GetDlgItem(hDlg, IDC_CPB), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPT), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) && wParam);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPNB), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPNT), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) && wParam);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPFB), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPFT), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) && wParam);
-				Changed = TRUE;
-				break;
-
-			case IDC_PREVIEW:
-				if (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED) {
-					POPUPDATAW Tester = {};
-					Tester.lchIcon = g_plugin.getIcon(IDI_NEWMAIL);
-					mir_wstrncpy(Tester.lpwzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);
-					mir_wstrncpy(Tester.lpwzText, TranslateT("You have N new mail messages"), MAX_SECONDLINE);
-					if (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) {
-						Tester.colorBack = SendDlgItemMessage(hDlg, IDC_CPB, CPM_GETCOLOUR, 0, 0);
-						Tester.colorText = SendDlgItemMessage(hDlg, IDC_CPT, CPM_GETCOLOUR, 0, 0);
-					}
-					else {
-						Tester.colorBack = GetSysColor(COLOR_BTNFACE);
-						Tester.colorText = GetSysColor(COLOR_WINDOWTEXT);
-					}
-					PUAddPopupW(&Tester);
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED) {
-					POPUPDATAW TesterF = {};
-					TesterF.lchIcon = g_plugin.getIcon(IDI_BADCONNECT);
-					mir_wstrncpy(TesterF.lpwzContactName, TranslateT("Account Test (failed)"), MAX_CONTACTNAME);
-					mir_wstrncpy(TesterF.lpwzText, TranslateT("Connection failed message"), MAX_SECONDLINE);
-					if (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) {
-						TesterF.colorBack = SendDlgItemMessage(hDlg, IDC_CPFB, CPM_GETCOLOUR, 0, 0);
-						TesterF.colorText = SendDlgItemMessage(hDlg, IDC_CPFT, CPM_GETCOLOUR, 0, 0);
-					}
-					else {
-						TesterF.colorBack = GetSysColor(COLOR_BTNFACE);
-						TesterF.colorText = GetSysColor(COLOR_WINDOWTEXT);
-					}
-					PUAddPopupW(&TesterF);
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED) {
-					POPUPDATAW TesterN = {};
-					TesterN.lchIcon = g_plugin.getIcon(IDI_LAUNCHAPP);
-					mir_wstrncpy(TesterN.lpwzContactName, TranslateT("Account Test"), MAX_CONTACTNAME);
-					mir_wstrncpy(TesterN.lpwzText, TranslateT("No new mail message"), MAX_SECONDLINE);
-					if (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) {
-						TesterN.colorBack = SendDlgItemMessage(hDlg, IDC_CPNB, CPM_GETCOLOUR, 0, 0);
-						TesterN.colorText = SendDlgItemMessage(hDlg, IDC_CPNT, CPM_GETCOLOUR, 0, 0);
-					}
-					else {
-						TesterN.colorBack = GetSysColor(COLOR_BTNFACE);
-						TesterN.colorText = GetSysColor(COLOR_WINDOWTEXT);
-					}
-					PUAddPopupW(&TesterN);
-				}
-				Changed = TRUE;
-				break;
-
-			case IDC_CHECKKBN:
-				Changed = TRUE;
-				break;
-
-			case IDC_CHECKPOP:
-				Changed = TRUE;
-				EnableWindow(GetDlgItem(hDlg, IDC_CHECKCOL), IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPB), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPT), (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_RADIOPOPN), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED));
-				EnableWindow(GetDlgItem(hDlg, IDC_RADIOPOP1), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED));
-				EnableWindow(GetDlgItem(hDlg, IDC_EDITPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED));
-				break;
-			case IDC_CHECKFPOP:
-				Changed = TRUE;
-				EnableWindow(GetDlgItem(hDlg, IDC_CHECKFCOL), IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPFB), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPFT), (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_EDITFPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED));
-				break;
-			case IDC_CHECKNPOP:
-				Changed = TRUE;
-				EnableWindow(GetDlgItem(hDlg, IDC_CHECKNCOL), IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPNB), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_CPNT), (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED) && IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED);
-				EnableWindow(GetDlgItem(hDlg, IDC_EDITNPOPS), (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED));
-				break;
+	void onChange_Pop(CCtrlCheck *)
+	{
+		bool bEnabled = chkPop.IsChecked();
+		chkCol.Enable(bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPB), chkCol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPT), chkCol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_RADIOPOPN), bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_RADIOPOP1), bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITPOPS), bEnabled);
+	}
 
-			}
-			if (HIWORD(wParam) == EN_CHANGE)
-				Changed = TRUE;
-			break;
+	void onChange_Fpop(CCtrlCheck *)
+	{
+		bool bEnabled = chkFpop.IsChecked();
+		chkFcol.Enable(bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFB), chkFcol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPFT), chkFcol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITFPOPS), bEnabled);
+	}
+
+	void onChange_Npop(CCtrlCheck *)
+	{
+		bool bEnabled = chkNpop.IsChecked();
+		chkNcol.Enable(bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNB), chkNcol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_CPNT), chkNcol.IsChecked() && bEnabled);
+		EnableWindow(GetDlgItem(m_hwnd, IDC_EDITNPOPS), bEnabled);
+	}
+
+	bool OnApply() override
+	{
+		wchar_t Text[MAX_PATH];
+		if (!GetDlgItemText(m_hwnd, IDC_COMBOACCOUNT, Text, _countof(Text)))
+			return false;
+
+		BOOL CheckPopup = chkPop.IsChecked();
+		BOOL CheckPopupW = chkCol.IsChecked();
+
+		BOOL CheckFPopup = chkFpop.IsChecked();
+		BOOL CheckFPopupW = chkFcol.IsChecked();
+
+		BOOL CheckNPopup = chkNpop.IsChecked();
+		BOOL CheckNPopupW = chkNcol.IsChecked();
+
+		BOOL CheckPopN = (IsDlgButtonChecked(m_hwnd, IDC_RADIOPOPN) == BST_CHECKED);
+
+		BOOL Translated;
+		UINT Time = GetDlgItemInt(m_hwnd, IDC_EDITPOPS, &Translated, FALSE);
+		if (!Translated) {
+			MessageBox(m_hwnd, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
+			SetFocus(GetDlgItem(m_hwnd, IDC_EDITPOPS));
+			return false;
 		}
-	case WM_NOTIFY:
-		switch (((LPNMHDR)lParam)->idFrom) {
-		case 0:
-			switch (((LPNMHDR)lParam)->code) {
-			case PSN_APPLY:
-				{
-					wchar_t Text[MAX_PATH];
-					BOOL Translated, CheckPopup, CheckPopupW;
-					BOOL CheckNPopup, CheckNPopupW, CheckFPopup, CheckFPopupW;
-					BOOL CheckPopN;
-					UINT Time, TimeN, TimeF;
-
-					if (GetDlgItemText(hDlg, IDC_COMBOACCOUNT, Text, _countof(Text))) {
-						CheckPopup = (IsDlgButtonChecked(hDlg, IDC_CHECKPOP) == BST_CHECKED);
-						CheckPopupW = (IsDlgButtonChecked(hDlg, IDC_CHECKCOL) == BST_CHECKED);
-
-						CheckFPopup = (IsDlgButtonChecked(hDlg, IDC_CHECKFPOP) == BST_CHECKED);
-						CheckFPopupW = (IsDlgButtonChecked(hDlg, IDC_CHECKFCOL) == BST_CHECKED);
-
-						CheckNPopup = (IsDlgButtonChecked(hDlg, IDC_CHECKNPOP) == BST_CHECKED);
-						CheckNPopupW = (IsDlgButtonChecked(hDlg, IDC_CHECKNCOL) == BST_CHECKED);
-
-						CheckPopN = (IsDlgButtonChecked(hDlg, IDC_RADIOPOPN) == BST_CHECKED);
-
-
-						Time = GetDlgItemInt(hDlg, IDC_EDITPOPS, &Translated, FALSE);
-						if (!Translated) {
-							MessageBox(hDlg, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
-							SetFocus(GetDlgItem(hDlg, IDC_EDITPOPS));
-							break;
-						}
-						TimeN = GetDlgItemInt(hDlg, IDC_EDITNPOPS, &Translated, FALSE);
-						if (!Translated) {
-							MessageBox(hDlg, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
-							SetFocus(GetDlgItem(hDlg, IDC_EDITNPOPS));
-							break;
-						}
-						TimeF = GetDlgItemInt(hDlg, IDC_EDITFPOPS, &Translated, FALSE);
-						if (!Translated) {
-							MessageBox(hDlg, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
-							SetFocus(GetDlgItem(hDlg, IDC_EDITFPOPS));
-							break;
-						}
-
-						DlgSetItemTextT(hDlg, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
-
-						ActualAccount->Flags =
-							(ActualAccount->Flags & YAMN_ACC_ENA) |
-							(ActualAccount->Flags & YAMN_ACC_SSL23) |
-							(ActualAccount->Flags & YAMN_ACC_NOTLS) |
-							(ActualAccount->Flags & YAMN_ACC_APOP) |
-							(ActualAccount->Flags & YAMN_ACC_BODY) |
-							(CheckPopN ? YAMN_ACC_POPN : 0);
-
-						ActualAccount->NewMailN.Flags =
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_SND) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_MSG) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_ICO) |
-							(CheckPopup ? YAMN_ACC_POP : 0) |
-							(CheckPopupW ? YAMN_ACC_POPC : 0) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_APP) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_KBN) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_CONT) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNICK) |
-							(ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNOEVENT) |
-							YAMN_ACC_MSGP;
-
-						ActualAccount->NoNewMailN.Flags =
-							(CheckNPopup ? YAMN_ACC_POP : 0) |
-							(CheckNPopupW ? YAMN_ACC_POPC : 0) |
-							(ActualAccount->NoNewMailN.Flags & YAMN_ACC_MSGP);
-
-						ActualAccount->BadConnectN.Flags =
-							(ActualAccount->BadConnectN.Flags & YAMN_ACC_SND) |
-							(ActualAccount->BadConnectN.Flags & YAMN_ACC_MSG) |
-							(ActualAccount->BadConnectN.Flags & YAMN_ACC_ICO) |
-							(CheckFPopup ? YAMN_ACC_POP : 0) |
-							(CheckFPopupW ? YAMN_ACC_POPC : 0);
-
-						ActualAccount->NewMailN.PopupB = SendDlgItemMessage(hDlg, IDC_CPB, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->NewMailN.PopupT = SendDlgItemMessage(hDlg, IDC_CPT, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->NewMailN.PopupTime = Time;
-
-						ActualAccount->NoNewMailN.PopupB = SendDlgItemMessage(hDlg, IDC_CPNB, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->NoNewMailN.PopupT = SendDlgItemMessage(hDlg, IDC_CPNT, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->NoNewMailN.PopupTime = TimeN;
-
-						ActualAccount->BadConnectN.PopupB = SendDlgItemMessage(hDlg, IDC_CPFB, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->BadConnectN.PopupT = SendDlgItemMessage(hDlg, IDC_CPFT, CPM_GETCOLOUR, 0, 0);
-						ActualAccount->BadConnectN.PopupTime = TimeF;
-
-						#ifdef DEBUG_SYNCHRO
-							DebugLog(SynchroFile, "Options:APPLY:ActualAccountSO-write done\n");
-						#endif
-						WriteDone(ActualAccount);
-						#ifdef DEBUG_SYNCHRO                    
-							DebugLog(SynchroFile, "Options:APPLY:AccountBrowserSO-write done\n");
-						#endif                                  
-						WriteDoneSO(POP3Plugin->AccountBrowserSO);
-
-						WritePOP3Accounts();
-						RefreshContact();
-						return TRUE;
-					}
-				}
-				break;
-			}
-			break;
+		UINT TimeN = GetDlgItemInt(m_hwnd, IDC_EDITNPOPS, &Translated, FALSE);
+		if (!Translated) {
+			MessageBox(m_hwnd, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
+			SetFocus(GetDlgItem(m_hwnd, IDC_EDITNPOPS));
+			return false;
+		}
+		UINT TimeF = GetDlgItemInt(m_hwnd, IDC_EDITFPOPS, &Translated, FALSE);
+		if (!Translated) {
+			MessageBox(m_hwnd, TranslateT("This is not a valid number value"), TranslateT("Input error"), MB_OK);
+			SetFocus(GetDlgItem(m_hwnd, IDC_EDITFPOPS));
+			return false;
 		}
-		break;
+
+		DlgSetItemTextW(m_hwnd, IDC_STTIMELEFT, TranslateT("Please wait while no account is in use."));
+
+		ActualAccount->Flags =
+			(ActualAccount->Flags & YAMN_ACC_ENA) |
+			(ActualAccount->Flags & YAMN_ACC_SSL23) |
+			(ActualAccount->Flags & YAMN_ACC_NOTLS) |
+			(ActualAccount->Flags & YAMN_ACC_APOP) |
+			(ActualAccount->Flags & YAMN_ACC_BODY) |
+			(CheckPopN ? YAMN_ACC_POPN : 0);
+
+		ActualAccount->NewMailN.Flags =
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_SND) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_MSG) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_ICO) |
+			(CheckPopup ? YAMN_ACC_POP : 0) |
+			(CheckPopupW ? YAMN_ACC_POPC : 0) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_APP) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_KBN) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_CONT) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNICK) |
+			(ActualAccount->NewMailN.Flags & YAMN_ACC_CONTNOEVENT) |
+			YAMN_ACC_MSGP;
+
+		ActualAccount->NoNewMailN.Flags =
+			(CheckNPopup ? YAMN_ACC_POP : 0) |
+			(CheckNPopupW ? YAMN_ACC_POPC : 0) |
+			(ActualAccount->NoNewMailN.Flags & YAMN_ACC_MSGP);
+
+		ActualAccount->BadConnectN.Flags =
+			(ActualAccount->BadConnectN.Flags & YAMN_ACC_SND) |
+			(ActualAccount->BadConnectN.Flags & YAMN_ACC_MSG) |
+			(ActualAccount->BadConnectN.Flags & YAMN_ACC_ICO) |
+			(CheckFPopup ? YAMN_ACC_POP : 0) |
+			(CheckFPopupW ? YAMN_ACC_POPC : 0);
+
+		ActualAccount->NewMailN.PopupB = SendDlgItemMessage(m_hwnd, IDC_CPB, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->NewMailN.PopupT = SendDlgItemMessage(m_hwnd, IDC_CPT, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->NewMailN.PopupTime = Time;
+
+		ActualAccount->NoNewMailN.PopupB = SendDlgItemMessage(m_hwnd, IDC_CPNB, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->NoNewMailN.PopupT = SendDlgItemMessage(m_hwnd, IDC_CPNT, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->NoNewMailN.PopupTime = TimeN;
+
+		ActualAccount->BadConnectN.PopupB = SendDlgItemMessage(m_hwnd, IDC_CPFB, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->BadConnectN.PopupT = SendDlgItemMessage(m_hwnd, IDC_CPFT, CPM_GETCOLOUR, 0, 0);
+		ActualAccount->BadConnectN.PopupTime = TimeF;
+
+		WriteDone(ActualAccount);
+		WriteDoneSO(POP3Plugin->AccountBrowserSO);
+
+		WritePOP3Accounts();
+		RefreshContact();
+		return TRUE;
 	}
-	if (Changed)
-		SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
-	return FALSE;
-}
+};
 
 //--------------------------------------------------------------------------------------------------
 
@@ -1323,19 +1221,16 @@ int YAMNOptInitSvc(WPARAM wParam, LPARAM)
 	odp.flags = ODPF_BOLDGROUPS;
 
 	odp.szTab.a = LPGEN("Accounts");
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTOPT);
-	odp.pfnDlgProc = DlgProcPOP3AccOpt;
+	odp.pDialog = new CAccOptDlg();
 	g_plugin.addOptions(wParam, &odp);
 
 	odp.szTab.a = LPGEN("General");
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_YAMNOPT);
-	odp.pfnDlgProc = DlgProcYAMNOpt;
+	odp.pDialog = new CGeneralOptDlg();
 	g_plugin.addOptions(wParam, &odp);
 
 	odp.szGroup.a = LPGEN("Popups");
 	odp.szTab.a = LPGEN("YAMN");
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP);
-	odp.pfnDlgProc = DlgProcPOP3AccPopup;
+	odp.pDialog = new CPopupOptsDlg();
 	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.h b/protocols/YAMN/src/proto/pop3/pop3opt.h
deleted file mode 100644
index 08dbdf55b3..0000000000
--- a/protocols/YAMN/src/proto/pop3/pop3opt.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __OPTIONS_H
-#define __OPTIONS_H
-
-#define M_SHOWACTUAL	0
-#define M_SHOWDEFAULT	1
-
-// Enables account in options
-BOOL DlgEnableAccount(HWND hDlg,WPARAM wParam,LPARAM lParam);
-
-// Sets dialog controls to match current account
-BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam);
-
-// Sets colors to match colors of actual account 
-BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam);
-
-// Initializes POP3 options for Miranda
-int POP3OptInit(WPARAM wParam,LPARAM lParam);
-
-//Sets dialog item text
-BOOL DlgSetItemText(HWND hDlg,WPARAM wParam,const char*);
-BOOL DlgSetItemTextW(HWND hDlg,WPARAM wParam,const wchar_t*);
-
-
-#define DlgSetItemTextT DlgSetItemTextW
-
-
-#endif