From 0cd3f146cfc3110944b63493bb740763e75207be Mon Sep 17 00:00:00 2001
From: tonio <devnull@localhost>
Date: Tue, 22 Jun 2010 12:21:03 +0200
Subject: [PATCH] url was not updated after an email was deleted (by clicking
 on delete when viewing a message).

---
 INSTALL                                 | 2 +-
 extensions/webmail/templates/index.html | 5 +++--
 extensions/webmail/views.py             | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index b3897f9f7..405e4ba28 100644
--- a/INSTALL
+++ b/INSTALL
@@ -511,7 +511,7 @@ Just run the following command to activate the component::
 
 Sometimes, inline images are integrated inside emails. To display
 them, MailNG stores them inside a temporary folder. Make sure the
-following path exists, or create it if not::
+following path exists, otherwise create it::
 
   # mkdir <path_to_mailng>/static/tmp
 
diff --git a/extensions/webmail/templates/index.html b/extensions/webmail/templates/index.html
index c60ca284b..9feddcae4 100644
--- a/extensions/webmail/templates/index.html
+++ b/extensions/webmail/templates/index.html
@@ -48,8 +48,9 @@
       var lnk = event.target;
 
       event.stop();
-      new Request.JSON({url: lnk.get("href"),
-                        onSuccess: get_callback("folder")}).get();
+      new Request.JSON({url: lnk.get("href"), onSuccess: function(resp) {
+                          current_anchor.parse_string(resp.next).update();
+                        }}).get();
     });
     setDivHeight("mailcontent", 5, 0);
   });
diff --git a/extensions/webmail/views.py b/extensions/webmail/views.py
index d537b9bfe..3eba93161 100644
--- a/extensions/webmail/views.py
+++ b/extensions/webmail/views.py
@@ -164,7 +164,8 @@ def delete(request, fdname, mail_id):
                         password=request.session["password"])
     mbc.move(mail_id, fdname, parameters.get_user(request.user, "webmail",
                                                   "TRASH_FOLDER"))
-    return folder(request, fdname, False)
+    ctx = getctx("ok", next=__get_current_url(request))
+    return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
 
 @login_required
 @is_not_localadmin()