diff --git a/mozilla/cmd/xfe/src/ComposeView.cpp b/mozilla/cmd/xfe/src/ComposeView.cpp
index 03d7ed18f3c..b00a0ee5bdb 100644
--- a/mozilla/cmd/xfe/src/ComposeView.cpp
+++ b/mozilla/cmd/xfe/src/ComposeView.cpp
@@ -112,7 +112,8 @@ const char *XFE_ComposeView::tabBeforeSubject = "XFE_ComposeView::tabBeforeSubje
 const char *XFE_ComposeView::tabAfterSubject = "XFE_ComposeView::tabAfterSubject";
 const char *XFE_ComposeView::tabPrev   = "XFE_ComposeView::tabPrev";
 const char *XFE_ComposeView::tabNext   = "XFE_ComposeView::tabNext";
-HG12111
+const char *XFE_ComposeView::updateSecurityOption= "XFE_ComposeView::updateSecurityOption";
+
 
 static void TabBeforeSubjectTraverse(Widget w, XEvent *, String *, Cardinal *)
 {
@@ -2533,6 +2534,10 @@ XFE_ComposeView::getCommandView(XFE_Command* )
 extern "C" void
 FE_SecurityOptionsChanged(MWContext * pContext)
 {
-   HG03833
+   XFE_Frame * pFrame = ViewGlue_getFrame(XP_GetNonGridContext(pContext));
+   if ( pFrame ) {
+        ((XFE_ComposeView*)pFrame->getView())->getToplevel()->
+		notifyInterested(XFE_ComposeView::updateSecurityOption, NULL);
+   }
 }
 
diff --git a/mozilla/cmd/xfe/src/ComposeView.h b/mozilla/cmd/xfe/src/ComposeView.h
index af02ee336f0..f1c591d6147 100644
--- a/mozilla/cmd/xfe/src/ComposeView.h
+++ b/mozilla/cmd/xfe/src/ComposeView.h
@@ -25,7 +25,6 @@
 #ifndef _xfe_composeview_h
 #define _xfe_composeview_h
 
-#include "rosetta.h"
 #include "MNView.h"  /* Has to be the first include because of xp_xx.h */
 #include "msgcom.h"
 #include "Command.h" /* For compose window commands */
@@ -72,7 +71,7 @@ public:
 	static const char* tabNext;
 	static const char* eFocusIn;
 	static const char* eFocusOut;
-	HG12172
+	static const char* updateSecurityOption;
 
 	static void    daFocusProc(Widget,XtPointer,XEvent*,Boolean*);
 	static void   topFocusProc(Widget,XtPointer,XEvent*,Boolean*);