diff -Nru torbirdy-0.2.0/ChangeLog torbirdy-0.2.1/ChangeLog
--- torbirdy-0.2.0/ChangeLog	2016-06-27 13:24:09.000000000 +0000
+++ torbirdy-0.2.1/ChangeLog	2016-11-24 16:20:05.000000000 +0000
@@ -1,3 +1,9 @@
+0.2.1,
+ * Bug 20157: Do not set calendar timezone to UTC
+ * Bug 20750, 20644: Ensure RSS feeds are displayed in plain text
+ * Revert setting no_proxies_on to an empty string
+ * Added support for automatic configuration of systemli.org email accounts
+
 0.2.0, 27 Jun 2016
 
  * Bug 6314: Prevent local timestamp disclosure via Date header
diff -Nru torbirdy-0.2.0/chrome/content/emailwizard.js torbirdy-0.2.1/chrome/content/emailwizard.js
--- torbirdy-0.2.0/chrome/content/emailwizard.js	2016-06-27 13:24:09.000000000 +0000
+++ torbirdy-0.2.1/chrome/content/emailwizard.js	2016-11-24 16:20:05.000000000 +0000
@@ -106,6 +106,10 @@
           config.incoming.hostname = "mail.%EMAILDOMAIN%";
           config.outgoing.hostname = "mail.%EMAILDOMAIN%";
           break;
+        case "systemli.org":
+          config.incoming.hostname = "mail.%EMAILDOMAIN%";
+          config.outgoing.hostname = "mail.%EMAILDOMAIN%";
+          break;
       }
 
       replaceVariables(config, realname, email, password);
diff -Nru torbirdy-0.2.0/components/torbirdy.js torbirdy-0.2.1/components/torbirdy.js
--- torbirdy-0.2.0/components/torbirdy.js	2016-06-27 13:24:09.000000000 +0000
+++ torbirdy-0.2.1/components/torbirdy.js	2016-11-24 16:20:05.000000000 +0000
@@ -37,8 +37,6 @@
 
   // Use a manual proxy configuration.
   "network.proxy.type": 1,
-  // https://bugs.torproject.org/10419
-  "network.proxy.no_proxies_on": "",
   // Restrict TBB ports.
   "network.security.ports.banned": "9050,9051,9150,9151",
   // Number of seconds to wait before attempting to recontact an unresponsive proxy server.
@@ -312,9 +310,6 @@
 
   // Mozilla Lightning.
   "calendar.useragent.extra": "",
-  // We have to set a timezone otherwise the system time is used. "UTC" or
-  // "GMT" is not an option so we set it to Europe/London.
-  "calendar.timezone.local": "Europe/London",
 
   /*
    Other Settings
@@ -325,6 +320,7 @@
   // These are similar to the mailnews.* settings.
   "rss.display.disallow_mime_handlers": 3,
   "rss.display.html_as": 1,
+  "rss.show.content-base": 1,
 
   // Override the user agent by setting it to an empty string.
   "general.useragent.override": "",
diff -Nru torbirdy-0.2.0/debian/changelog torbirdy-0.2.1/debian/changelog
--- torbirdy-0.2.0/debian/changelog	2016-07-05 21:11:45.000000000 +0000
+++ torbirdy-0.2.1/debian/changelog	2016-12-01 20:05:02.000000000 +0000
@@ -1,3 +1,14 @@
+torbirdy (0.2.1-1) unstable; urgency=medium
+
+  * New upstream version:
+    - Do not set calendar timezone to UTC.
+    - Bug 20750, 20644: Ensure RSS feeds are displayed in plain text.
+    - Revert setting no_proxies_on to an empty string.
+    - Add support for automatic configuration of systemli.org
+      email accounts.
+
+ -- Ulrike Uhlig <u@451f.org>  Thu, 01 Dec 2016 21:05:02 +0100
+
 torbirdy (0.2.0-1) unstable; urgency=medium
 
   * New upstream version:
diff -Nru torbirdy-0.2.0/install.rdf torbirdy-0.2.1/install.rdf
--- torbirdy-0.2.0/install.rdf	2016-06-27 13:24:09.000000000 +0000
+++ torbirdy-0.2.1/install.rdf	2016-11-24 16:20:05.000000000 +0000
@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>castironthunderbirdclub@torproject.org</em:id>
-    <em:version>0.2.0</em:version>
+    <em:version>0.2.1</em:version>
     <em:type>2</em:type>
     <em:iconURL>chrome://castironthunderbirdclub/skin/images/tor.png</em:iconURL>
 
diff -Nru torbirdy-0.2.0/README.RELEASE torbirdy-0.2.1/README.RELEASE
--- torbirdy-0.2.0/README.RELEASE	2016-06-27 13:24:09.000000000 +0000
+++ torbirdy-0.2.1/README.RELEASE	2016-11-24 16:20:05.000000000 +0000
@@ -16,5 +16,6 @@
   Upload the package to Mozilla's AddOn site manually
   Write a blog post anouncing the release on the Tor Project blog
   Write an email anouncing the release to tor-talk
+  Bump the version number on the wiki and make other relevant changes
   Announce the release widely in whatever format is reasonable or desired