diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 7ce6c5184..9e4784139 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -52,7 +52,8 @@ SchedulerUI_OBJC_FILES =		\
 
 SchedulerUI_RESOURCE_FILES += \
 	Version		\
-	product.plist
+	product.plist	\
+	SchedulerUI.js
 
 SchedulerUI_RESOURCE_FILES += \
 	images/next_week.gif			\
diff --git a/UI/Scheduler/SchedulerUI.js b/UI/Scheduler/SchedulerUI.js
new file mode 100644
index 000000000..11d6d6f7d
--- /dev/null
+++ b/UI/Scheduler/SchedulerUI.js
@@ -0,0 +1,9 @@
+function newEvent(sender) {
+  var urlstr;
+  
+  urlstr = "new";
+  window.open(urlstr, "SOGo_compose",
+	      "width=680,height=520,resizable=1,scrollbars=1,toolbar=0," +
+	      "location=0,directories=0,status=0,menubar=0,copyhistory=0");
+  return false; /* stop following the link */
+}
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
index f377d4215..f198607be 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
@@ -1,6 +1,8 @@
 ( /* the toolbar groups -*-cperl-*- */
-  ( { link  = "new";
+  ( { link  = "#";
+      isSafe   = NO;
       label="New Event";
+      onclick  = "newEvent(this);return false;";
       image="new-event.png"; },
     { link  = "new_task";
       label="New Task";
diff --git a/UI/Templates/UIxAppointmentEditor.wox b/UI/Templates/UIxAppointmentEditor.wox
index 537731229..020849fe5 100644
--- a/UI/Templates/UIxAppointmentEditor.wox
+++ b/UI/Templates/UIxAppointmentEditor.wox
@@ -8,6 +8,14 @@
   className="UIxPageFrame"
   title="name"
 >
+  <script type="text/javascript">
+    function submitMeeting(thisForm) {
+      thisForm.submit();
+      opener.window.location.reload();
+      window.close();
+    }
+  </script>
+
   <var:js-stringtable const:framework="SchedulerUI.SOGo"
                       const:identifier="labels" />
   
@@ -313,9 +321,11 @@
         </tr>
         <tr>
           <td>
-              <input type="submit" label:value="Save" name="save:method" />
+              <input type="submit" label:value="Save" name="save:method"
+	        onclick="submitMeeting(this.form); return false;" />
               <span class="button_auto_env"
               ><a href="../weekoverview"
+		  onclick="window.close(); return false;"
                   var:queryDictionary="queryParameters"
                   class="button_auto"
                ><var:string label:value="Cancel" /></a></span>