diff --git a/.hgpatchinfo/add-jquery.dep b/.hgpatchinfo/add-jquery.dep
index d076f33346..f6875ea578 100644
--- a/.hgpatchinfo/add-jquery.dep
+++ b/.hgpatchinfo/add-jquery.dep
@@ -1 +1 @@
-96b37b501ea5c25ad20e12397bde8bce017f26f5
\ No newline at end of file
+d0b11a9ca29d7ad276ff71e30b074a3a10c47381
\ No newline at end of file
diff --git a/.hgpatchinfo/add-protovis.dep b/.hgpatchinfo/add-protovis.dep
index 37fd8f1c92..6d552866b5 100644
--- a/.hgpatchinfo/add-protovis.dep
+++ b/.hgpatchinfo/add-protovis.dep
@@ -1 +1 @@
-75644ade5a9a533d44e7dca16de13b21f3f70ef6
\ No newline at end of file
+856938cc9dbee82f8dfaf817f528289c805c2616
\ No newline at end of file
diff --git a/.hgpatchinfo/gloda-facet.dep b/.hgpatchinfo/gloda-facet.dep
index 204ec5000f..ceea660e7e 100644
--- a/.hgpatchinfo/gloda-facet.dep
+++ b/.hgpatchinfo/gloda-facet.dep
@@ -1 +1 @@
-dd2678994084e8780033d679abdbcdfc70046211
\ No newline at end of file
+d0e3888205d0d1bb4069ec5f804d60c06e1c977f
\ No newline at end of file
diff --git a/calendar/itip/calItipEmailTransport.js b/calendar/itip/calItipEmailTransport.js
index 53c60f3032..be95e94e11 100644
--- a/calendar/itip/calItipEmailTransport.js
+++ b/calendar/itip/calItipEmailTransport.js
@@ -301,12 +301,11 @@ calItipEmailTransport.prototype = {
                 let mimeConverter = Components.classes["@mozilla.org/messenger/mimeconverter;1"]
                                               .createInstance(Components.interfaces.nsIMimeConverter);
                 let fieldNameLen = (header.indexOf(": ") + 2);
-                return (header.substring(0, fieldNameLen) +
-                        mimeConverter.encodeMimePartIIStr_UTF8(header.substring(fieldNameLen),
-                                                               false,
-                                                               "UTF-8",
-                                                               fieldNameLen,
-                                                               72 - fieldNameLen));
+                return mimeConverter.encodeMimePartIIStr_UTF8(header,
+                                                              false,
+                                                              "UTF-8",
+                                                              fieldNameLen,
+                                                              Components.interfaces.nsIMimeConverter.MIME_ENCODED_WORD_SIZE);
             }
 
             var itemList = aItem.getItemList({});