diff --git a/windows/defdlg.c b/windows/defdlg.c
index 95052cbccdc..05f234c7898 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -227,6 +227,9 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
             PostMessageA( hwnd, WM_COMMAND, IDCANCEL,
                             (LPARAM)GetDlgItem( hwnd, IDCANCEL ) );
             return 0;
+    
+        case WM_NOTIFYFORMAT:
+	    return DefWindowProcA( hwnd, msg, wParam, lParam );
     }
     return 0;
 }
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 94f7d0c1ab7..e86c6cc0936 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -390,6 +390,10 @@ static LRESULT DEFWND_DefWinProc( WND *wndPtr, UINT msg, WPARAM wParam,
     case WM_ISACTIVEICON:
 	return ((wndPtr->flags & WIN_NCACTIVATED) != 0);
 
+    case WM_NOTIFYFORMAT:
+      if (IsWindowUnicode(wndPtr->hwndSelf)) return NFR_UNICODE;
+      else return NFR_ANSI;
+        
     case WM_QUERYOPEN:
     case WM_QUERYENDSESSION:
 	return 1;