3 files changed, 11 insertions, 4 deletions
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 55ca576727..4767d84312 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -850,7 +850,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 				return TRUE;
 			}
 		}
-		// fall through
+		__fallthrough;
 
 	case WM_LBUTTONDOWN:
 	case WM_MBUTTONDOWN:
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index dac3fdb793..b06bdb9b64 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -371,7 +371,8 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 				}
 			}
 			dat->stage = STREAMSTAGE_TAIL;
-			// fall through
+			__fallthrough;
+
 		case STREAMSTAGE_TAIL:
 			CreateRTFTail(dat->buf);
 			dat->stage = STREAMSTAGE_STOP;
diff --git a/src/core/stduserinfo/src/contactinfo.cpp b/src/core/stduserinfo/src/contactinfo.cpp
index 4a1c8ba273..41a5c6331e 100644
--- a/src/core/stduserinfo/src/contactinfo.cpp
+++ b/src/core/stduserinfo/src/contactinfo.cpp
@@ -42,9 +42,12 @@ static INT_PTR CALLBACK EditUserEmailDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 		switch (LOWORD(wParam)) {
 		case IDOK:
 			GetDlgItemTextA(hwndDlg, IDC_EMAIL, (char*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA), 256);
-			//fall through
+			__fallthrough;
+
 		case IDCANCEL:
 			EndDialog(hwndDlg, wParam);
+			__fallthrough;
+
 		case IDC_EMAIL:
 			if (HIWORD(wParam) == EN_CHANGE)
 				EnableWindow(GetDlgItem(hwndDlg, IDOK), GetWindowTextLength(GetDlgItem(hwndDlg, IDC_EMAIL)));
@@ -100,9 +103,12 @@ static INT_PTR CALLBACK EditUserPhoneDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 				}
 				if (IsDlgButtonChecked(hwndDlg, IDC_SMS)) mir_strcat(szText, " SMS");
 			}
-			//fall through
+			__fallthrough;
+
 		case IDCANCEL:
 			EndDialog(hwndDlg, wParam);
+			__fallthrough;
+
 		case IDC_COUNTRY:
 			if (HIWORD(wParam) != CBN_SELCHANGE)
 				break;