diff --git a/mozilla/calendar/resources/content/calendarEventDialog.js b/mozilla/calendar/resources/content/calendarEventDialog.js
index 10e0152b368..66c3c4a4047 100644
--- a/mozilla/calendar/resources/content/calendarEventDialog.js
+++ b/mozilla/calendar/resources/content/calendarEventDialog.js
@@ -134,22 +134,8 @@ function loadCalendarEventDialog()
    }
    
    var titleString = titleDataItem.getAttribute( "value" );
-   setFieldValue( "standard-dialog-title-text", titleString );
+   document.getElementById("calendar-new-eventwindow").setAttribute("title", titleString);
 
-   // show proper tip
-   
-   if( "new" == args.mode )
-   {
-      setFieldValue( "tip-new", false, "collapsed" );
-      setFieldValue( "tip-edit", true, "collapsed" );
-   }
-   else
-   {
-      setFieldValue( "tip-new", true, "collapsed" );
-      setFieldValue( "tip-edit", false, "collapsed" );
-   }
-   
-  
    //create the category drop down
    //if( !gCategoryManager )
    //   Categories = opener.gCategoryManager.getAllCategories();
diff --git a/mozilla/calendar/resources/content/calendarEventDialog.xul b/mozilla/calendar/resources/content/calendarEventDialog.xul
index 60d631a8d86..5dd75c8d4e9 100644
--- a/mozilla/calendar/resources/content/calendarEventDialog.xul
+++ b/mozilla/calendar/resources/content/calendarEventDialog.xul
@@ -57,7 +57,7 @@
 
 <window
    id="calendar-new-eventwindow"
-   title="Internet Appliance Dialog - Calendar Event"
+   title="Calendar Event"
    orient="vertical"
    onload="loadCalendarEventDialog()"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -96,25 +96,6 @@
     
     <vbox id="dialog-box" flex="1">  
    
-      <!-- standard-dialog-title: from dialogOverlay.xul -->
-      
-      <box id="standard-dialog-title">
-         <image id="standard-dialog-title-icon" insertbefore="standard-dialog-title-text-box"/>
-         <spacer flex="1" insertafter="standard-dialog-title-icon"/>
-         <box id="standard-dialog-title-text-box">
-            <label id="standard-dialog-title-text"/>
-         </box>
-         <spacer id="second-title-spring" flex="1" insertafter="standard-dialog-title-text-box"/>
-      </box>
- 
-            
-        <!-- standard-dialog-tips: from dialogOverlay.xul  Proper tip is shown in on load code-->
-        
-        <box id="standard-dialog-tips">
-          <description id="tip-new"  collapsed ="true" >&event.tip.new;</description>
-          <description id="tip-edit" collapsed ="false">&event.tip.edit;</description>
-        </box>
-        
         <!-- standard-dialog-content: from dialogOverlay.xul  -->
         
         <vbox id="standard-dialog-content"  flex="1">
diff --git a/mozilla/calendar/resources/content/eventDialog.js b/mozilla/calendar/resources/content/eventDialog.js
index 10e0152b368..66c3c4a4047 100644
--- a/mozilla/calendar/resources/content/eventDialog.js
+++ b/mozilla/calendar/resources/content/eventDialog.js
@@ -134,22 +134,8 @@ function loadCalendarEventDialog()
    }
    
    var titleString = titleDataItem.getAttribute( "value" );
-   setFieldValue( "standard-dialog-title-text", titleString );
+   document.getElementById("calendar-new-eventwindow").setAttribute("title", titleString);
 
-   // show proper tip
-   
-   if( "new" == args.mode )
-   {
-      setFieldValue( "tip-new", false, "collapsed" );
-      setFieldValue( "tip-edit", true, "collapsed" );
-   }
-   else
-   {
-      setFieldValue( "tip-new", true, "collapsed" );
-      setFieldValue( "tip-edit", false, "collapsed" );
-   }
-   
-  
    //create the category drop down
    //if( !gCategoryManager )
    //   Categories = opener.gCategoryManager.getAllCategories();
diff --git a/mozilla/calendar/resources/content/eventDialog.xul b/mozilla/calendar/resources/content/eventDialog.xul
index 60d631a8d86..5dd75c8d4e9 100644
--- a/mozilla/calendar/resources/content/eventDialog.xul
+++ b/mozilla/calendar/resources/content/eventDialog.xul
@@ -57,7 +57,7 @@
 
 <window
    id="calendar-new-eventwindow"
-   title="Internet Appliance Dialog - Calendar Event"
+   title="Calendar Event"
    orient="vertical"
    onload="loadCalendarEventDialog()"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -96,25 +96,6 @@
     
     <vbox id="dialog-box" flex="1">  
    
-      <!-- standard-dialog-title: from dialogOverlay.xul -->
-      
-      <box id="standard-dialog-title">
-         <image id="standard-dialog-title-icon" insertbefore="standard-dialog-title-text-box"/>
-         <spacer flex="1" insertafter="standard-dialog-title-icon"/>
-         <box id="standard-dialog-title-text-box">
-            <label id="standard-dialog-title-text"/>
-         </box>
-         <spacer id="second-title-spring" flex="1" insertafter="standard-dialog-title-text-box"/>
-      </box>
- 
-            
-        <!-- standard-dialog-tips: from dialogOverlay.xul  Proper tip is shown in on load code-->
-        
-        <box id="standard-dialog-tips">
-          <description id="tip-new"  collapsed ="true" >&event.tip.new;</description>
-          <description id="tip-edit" collapsed ="false">&event.tip.edit;</description>
-        </box>
-        
         <!-- standard-dialog-content: from dialogOverlay.xul  -->
         
         <vbox id="standard-dialog-content"  flex="1">