From f40e515cb207aa924ae7468469a0ffbc9e56929d Mon Sep 17 00:00:00 2001
From: JohnDoh <roundcube@tehinterweb.co.uk>
Date: Fri, 17 Feb 2017 11:42:44 +0000
Subject: [PATCH 1/3] don't use env for group-rename action

---
 program/js/app.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 2fdd10ce1..341be6861 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6219,13 +6219,15 @@ function rcube_webmail()
 
     var group_name = this.env.contactgroups['G' + this.env.source + this.env.group].name,
       input = $('<input>').attr('type', 'text').val(group_name),
-      content = $('<label>').text(this.get_label('namex')).append(input);
+      content = $('<label>').text(this.get_label('namex')).append(input),
+      source = this.env.source,
+      group = this.env.group;
 
     this.simple_dialog(content, 'grouprename',
       function() {
         var name;
         if ((name = input.val()) && name != group_name) {
-          ref.http_post('group-rename', {_source: ref.env.source, _gid: ref.env.group, _name: name},
+          ref.http_post('group-rename', {_source: source, _gid: group, _name: name},
             ref.set_busy(true, 'loading'));
           return true;
         }

From 82d049f1a2be9648042f1717aaf0c3b4aa56c727 Mon Sep 17 00:00:00 2001
From: JohnDoh <roundcube@tehinterweb.co.uk>
Date: Fri, 17 Feb 2017 13:33:23 +0000
Subject: [PATCH 2/3] check group id matches current one before changing the
 title

---
 program/js/app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/program/js/app.js b/program/js/app.js
index 8dfeafc04..55187c0bb 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6322,7 +6322,9 @@ function rcube_webmail()
     else {
       $(this.treelist.get_item(key)).children().first().html(prop.name);
       this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
-      this.set_group_prop(prop);
+
+      if (prop.id == this.env.group)
+        this.set_group_prop(prop);
     }
 
     // update list node and re-sort it

From 336e937946a2936ed7b0bbc0df696627c4f44934 Mon Sep 17 00:00:00 2001
From: JohnDoh <roundcube@tehinterweb.co.uk>
Date: Sat, 18 Feb 2017 11:31:09 +0000
Subject: [PATCH 3/3] also fix source in group create function

---
 program/js/app.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 55187c0bb..7a8afff9c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -6195,13 +6195,14 @@ function rcube_webmail()
   this.group_create = function()
   {
     var input = $('<input>').attr('type', 'text'),
-      content = $('<label>').text(this.get_label('namex')).append(input);
+      content = $('<label>').text(this.get_label('namex')).append(input),
+      source = this.env.source;
 
     this.simple_dialog(content, 'newgroup',
       function() {
         var name;
         if (name = input.val()) {
-          ref.http_post('group-create', {_source: ref.env.source, _name: name},
+          ref.http_post('group-create', {_source: source, _name: name},
             ref.set_busy(true, 'loading'));
           return true;
         }