diff --git a/mozilla/browser/components/shell/src/nsWindowsShellService.cpp b/mozilla/browser/components/shell/src/nsWindowsShellService.cpp
index 61ec5e405b3..4f7d4218dae 100644
--- a/mozilla/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/mozilla/browser/components/shell/src/nsWindowsShellService.cpp
@@ -182,6 +182,9 @@ typedef struct {
 #define CLS "SOFTWARE\\Classes\\"
 #define DI "\\DefaultIcon"
 #define SOP "\\shell\\open\\command"
+#define DDE "\\shell\\open\\ddeexec\\"
+#define DDE_NAME "Firefox" // This must be kept in sync with ID_DDE_APPLICATION_NAME as defined in splash.rc
+#define DDE_COMMAND "\"%1\",,0,0,,,,"
 #define EXE "firefox.exe"
 
 #define CLS_HTML "FirefoxHTML"
@@ -194,6 +197,9 @@ typedef struct {
 #define MAKE_KEY_NAME2(PREFIX, MID, SUFFIX) \
   PREFIX MID SUFFIX
 
+#define MAKE_KEY_NAME3(PREFIX, MID, MID2, SUFFIX) \
+  PREFIX MID MID2 SUFFIX
+
 static SETTING gSettings[] = {
   // Extension Manager Keys
   { MAKE_KEY_NAME1(CLS, "MIME\\Database\\Content Type\\application/x-xpinstall;app=firefox"),
@@ -224,6 +230,28 @@ static SETTING gSettings[] = {
   { MAKE_KEY_NAME2(CLS, "CHROME", DI),  "", VAL_ICON, PATH_SUBSTITUTION | NON_ESSENTIAL },
   { MAKE_KEY_NAME2(CLS, "CHROME", SOP), "", VAL_OPEN, PATH_SUBSTITUTION | NON_ESSENTIAL },
 
+  // DDE settings
+  { MAKE_KEY_NAME2(CLS, "HTTP", DDE), "", DDE_COMMAND, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTP", DDE, "Application"), "", DDE_NAME, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTP", DDE, "Topic"), "", "WWW_OpenURL", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTP", DDE, "ifexec"), "", "StartDDE", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "HTTPS", DDE), "", DDE_COMMAND, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTPS", DDE, "Application"), "", DDE_NAME, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTPS", DDE, "Topic"), "", "WWW_OpenURL", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "HTTPS", DDE, "ifexec"), "", "StartDDE", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "FTP", DDE), "", DDE_COMMAND, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "FTP", DDE, "Application"), "", DDE_NAME, NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "FTP", DDE, "Topic"), "", "WWW_OpenURL", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME3(CLS, "FTP", DDE, "ifexec"), "", "StartDDE", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "GOPHER", DDE), "", DDE_COMMAND, NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "GOPHER", DDE, "Application"), "", DDE_NAME, NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "GOPHER", DDE, "Topic"), "", "WWW_OpenURL", NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "GOPHER", DDE, "ifexec"), "", "StartDDE", NO_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "CHROME", DDE), "", DDE_COMMAND, NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "CHROME", DDE, "Application"), "", DDE_NAME, NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "CHROME", DDE, "Topic"), "", "WWW_OpenURL", NO_SUBSTITUTION | NON_ESSENTIAL  },
+  { MAKE_KEY_NAME3(CLS, "CHROME", DDE, "ifexec"), "", "StartDDE", NO_SUBSTITUTION },
+
   // Windows XP Start Menu
   { MAKE_KEY_NAME2(SMI, "%APPEXE%", DI),  
     "", 
diff --git a/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp b/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
index 44cc1fb339a..2565c64d039 100644
--- a/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -904,7 +904,7 @@ nsNativeAppSupportWin::HandleDDENotification( UINT uType,       // transaction t
     if (!mCanHandleRequests)
         return 0;
 
-
+#ifdef DEBUG
     printf( "DDE: uType  =%s\n",      uTypeDesc( uType ).get() );
     printf( "     uFmt   =%u\n",      (unsigned)uFmt );
     printf( "     hconv  =%08x\n",    (int)hconv );
@@ -913,6 +913,7 @@ nsNativeAppSupportWin::HandleDDENotification( UINT uType,       // transaction t
     printf( "     hdata  =%08x\n",    (int)hdata );
     printf( "     dwData1=%08x\n",    (int)dwData1 );
     printf( "     dwData2=%08x\n",    (int)dwData2 );
+#endif
 
     HDDEDATA result = 0;
     if ( uType & XCLASS_BOOL ) {
@@ -932,8 +933,7 @@ nsNativeAppSupportWin::HandleDDENotification( UINT uType,       // transaction t
     } else if ( uType & XCLASS_DATA ) {
         if ( uType == XTYP_REQUEST ) {
             switch ( FindTopic( hsz1 ) ) {
-                case topicOpenURL: {
-                  MessageBox(NULL, "test", "hello", MB_OK);
+                case topicOpenURL: {                  
                     nsCAutoString start;
                     ParseDDEArg(hsz2, 0, start);
                     if (start.Equals("StartDDE"))