From 16b82bf6044ef8bff1acca10b0759dc59068c498 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 5 Sep 2019 21:40:35 +0300
Subject: more correct fix for #2046

---
 src/core/stdmsg/src/msgdialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 8d80c15316..c82cdcb866 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -161,11 +161,11 @@ bool CMsgDialog::OnInitDialog()
 	m_log.SendMsg(EM_AUTOURLDETECT, TRUE, 0);
 
 	m_message.SendMsg(EM_SETEVENTMASK, 0, ENM_CHANGE);
-	OnOptionsApplied(false);
 
 	if (isChat()) {
 		m_avatar.Hide();
 
+		OnOptionsApplied(false);
 		OnActivate();
 		UpdateOptions();
 		UpdateStatusBar();
@@ -242,6 +242,8 @@ bool CMsgDialog::OnInitDialog()
 				UpdateLastMessage();
 		}
 
+		OnOptionsApplied(false);
+
 		// restore saved msg if any...
 		if (m_hContact) {
 			DBVARIANT dbv;
-- 
cgit v1.2.3