diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index bba1ef46c..98a9d74b8 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -82,7 +82,7 @@ static NSTimeZone     *EST = nil;
   NSString *aptUID;
   
   aptUID = [[self newApt] uid];
-  return [NSString stringWithFormat:@"%@/Calendar/%@/view?tab=participants",
+  return [NSString stringWithFormat:@"%@/Calendar/%@/edit?mail-invitation=yes",
                                     [self homePageURL],
                                     aptUID];
 }
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index ed9460fe5..ecb533134 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -84,9 +84,9 @@
             ><var:component-content
               /></div>
           <noscript>
-            <div id="noJavascriptError">
+            <div class="javascriptPopupBackground">
             </div>
-            <div class="noJavascriptErrorMessage">
+            <div class="javascriptMessagePseudoWindow noJavascriptErrorMessage">
               <var:string label:value="noJavascriptError"
                 /><br /><br
                 /><a class="button" var:href="page.context.uri"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 7b0da8922..f7ca749e1 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -126,11 +126,27 @@ function modifyEvent(sender, modification) {
   return false;
 }
 
+function closeInvitationWindow() {
+  var closeDiv = document.createElement("div");
+  closeDiv.addClassName("javascriptPopupBackground");
+  var closePseudoWin = document.createElement("div");
+  closePseudoWin.addClassName("javascriptMessagePseudoWindow");
+  closePseudoWin.style.top = "0px;";
+  closePseudoWin.style.left = "0px;";
+  closePseudoWin.style.right = "0px;";
+  closePseudoWin.appendChild(document.createTextNode(labels["closeThisWindowMessage"].decodeEntities()));
+  document.body.appendChild(closeDiv);
+  document.body.appendChild(closePseudoWin);
+}
+
 function modifyEventCallback(http) {
   if (http.readyState == 4) {
     if (http.status == 200) {
       log("closing window...?");
-      window.close();
+      if (queryParameters["mail-invitation"] == "yes")
+        closeInvitationWindow();
+      else
+        window.close();
     }
     else {
       log("showing alert...");
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 1e8bb4410..819612920 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -646,7 +646,7 @@ INPUT#searchValue
   background-position: 2px 2px;
   color: #aaa; }
 
-DIV#noJavascriptError
+DIV.javascriptPopupBackground
 { position: absolute;
   background: #999;
   -moz-opacity: 0.6; 
@@ -657,7 +657,7 @@ DIV#noJavascriptError
   bottom: 0px;
   text-align: center; }
 
-DIV.noJavascriptErrorMessage
+DIV.javascriptMessagePseudoWindow
 { position: absolute;
   z-index: 2;
   border-top: 2px solid #fffffb;
@@ -669,15 +669,16 @@ DIV.noJavascriptErrorMessage
   -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
   -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
   padding: 1em;
-  top: 10em;
-  left: 17em;
-  width: 24em;
   margin: 0px auto;
-  background: #fff;
   -moz-opacity: 1.0;
   color: #000;
   background: #dedede; }
 
+DIV.noJavascriptErrorMessage
+{ top: 10em;
+  left: 17em;
+  width: 24em; }
+
 DIV.noJavascriptErrorMessage A
 { float: right;
   margin: 0px auto; }