$ git diff --patch-with-stat --summary 1038b380d8d6f9d76323711e593a5af6b8222bb8..410f91e39ec2f1542ecc36cf58ebdc83a7a7b8eb

 .abf.yml              | 109 +++++++++++++++++++++++++-------------------------
 rust-1.33-build.patch |  39 ++++++++++++++++++
 thunderbird.spec      |  13 +++---
 3 files changed, 102 insertions(+), 59 deletions(-)
 create mode 100644 rust-1.33-build.patch

diff --git a/.abf.yml b/.abf.yml
index 3ae1c6a..186dfe8 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -7,61 +7,62 @@ removed_sources:
   enigmail-2.0.4.tar.gz: c660eccd739970b84a2d4c35c279c949b9e78c30
   enigmail-2.0.7.tar.gz: 5b34b3823f506277aa7a15c853e5274c56e8a71f
   enigmail-2.0.8.tar.gz: 2667701b932af9cc75385cd313506a131c1e45d4
+  enigmail-2.0.9.tar.gz: 79262ed8331d29489d575c7d64be2e6d6cb5e077
 sources:
-  ar.xpi: cd9b2cd32c8c0eeb74001d6fdbc63c54ef472897
-  ast.xpi: 9f867b6576358ab1fe8b454b719fa24d14b2d0cf
-  be.xpi: 2b5b1df6b42b0bf6803fa3bffd73c355d9db2d57
-  bg.xpi: 3a0432fe9553cb4ee0e76c6eae72f5ad38a32eda
+  ar.xpi: 79e8d10aef1abb4a8dd5a25cd8a5e7722a0adf39
+  ast.xpi: bbd0a8a6e6d1adfc651e3d4e60506fd380cea00f
+  be.xpi: f6161e6559b9908cf1a949d89ee5f3f534e9ad9b
+  bg.xpi: 70094111fc967be0b863e5af4a05a08aea8bb41a
   bn-BD.xpi: 517ee16d261f25248ddc950309efda97cbeeeef1
-  br.xpi: c507b75abcf08dcd250428feea71cd7c4fa94306
-  ca.xpi: 7b0f3fcc9d1bcdc2763251f0e8076c97d96dc040
-  cs.xpi: 5332eed1cf926efcdcc5351d29c97ac84c44a1a8
-  da.xpi: 6c5f459395ed98015ff059a982f07d92b9375f94
-  de.xpi: b05cdf3e34f6cdc9e26cd337054b72c3cc3a0b3c
-  el.xpi: 40c0bfbc1f6442b9b1c9c5c75748ea0d9a91d0b9
-  en-GB.xpi: 981c9fc66f702ebca1d5c6f2fcf9a31d9f28ab6e
-  en-US.xpi: 24500004f8e4451cf1b8bc3905f5448fc2a9f22e
-  enigmail-2.0.9.tar.gz: 79262ed8331d29489d575c7d64be2e6d6cb5e077
-  enigmail-2.0.9.tar.gz.asc: ab070b48fc40e2bbbd6ec3b5038c4b71d502ac9c
-  es-AR.xpi: c045de311d993c091c2b21f2c3c1f03779480516
-  es-ES.xpi: 99a7dccd26db8fb48ea16ebc597b7afffe037428
-  et.xpi: 1973e5d8290ac0770446b6011746f853105f3ae4
-  eu.xpi: 80f7545929148879dec840f6fb34a041e3ab2cc2
-  fi.xpi: 8c15a1822c51c867d489d2e69b12035a4057e71c
-  fr.xpi: 291305a092ac5ebdf8bb30d4d62b9593b2cdaf5c
-  fy-NL.xpi: 65763a08972829e9ee4698f78cbf6957daf485b6
-  ga-IE.xpi: dc4b63ac2b81672d77df4fd4d8101b6667da5fed
-  gd.xpi: bcf01811352f317bf9d6facaabb74e03e3cab5ad
-  gl.xpi: cbca8085e28f8d70ce1297f6ba5e02c830ae28c1
-  he.xpi: 20fa76fa85df5d180ae4372b1ab0a13a9fbcdfad
-  hr.xpi: 0255d48ea834327cc66ad3ce54ebe0b97939de45
-  hu.xpi: e7751cb1615364bcff770c9a3875e3261eab059b
-  hy-AM.xpi: 7e58b8ec92902c52999714bdab66e66b76e2e50c
-  id.xpi: b374180fc0f2578c6d7100c1ea5d412d5a03b27b
-  is.xpi: e097ebfa77695908dedd6fb4439dfde9b0e5dc4d
-  it.xpi: 2a91dce89aec629e1853bfbb88a2b8fc8b4c6ef4
-  ja.xpi: d3be8897ef5f0f1129c4721dc3e59be7347b2c99
-  ko.xpi: 66e92e06e46b0db64999dfadccf5624ae138387e
-  lt.xpi: 170b486382c4e304147d28514786643550a6eb0d
-  nb-NO.xpi: b8163cf93eb02cf890de65fd70dcb79b41bdfb15
-  nl.xpi: 7633d619ba2f391598b23e486cb318b7b6a1d18c
-  nn-NO.xpi: 888e4a2b67cbc457943996105af1beb0430ae81d
+  br.xpi: f4212b4feda4ed81907e9c9ba5e21b3399b1530a
+  ca.xpi: d5db02f7843ddcca34a17f66f77c03b17fc84ca0
+  cs.xpi: ed4bcd62bbc5f0544b5e17512fdee531698b8ce4
+  da.xpi: 207ae3251718e9ac90da12875d1b826218b948b0
+  de.xpi: 4af9f0b6fca5c50496db45d3d49ea1d16f8eed66
+  el.xpi: 8439c61201c7497f5cad269ead6c33c7b6142438
+  en-GB.xpi: 14ba586b2c74ed0be2519931022e70aa83072ffa
+  en-US.xpi: 0437f645e947cd08ea9c52c487eb52e4972f9e1f
+  enigmail-2.0.10.tar.gz: 5648000c5b1a35b326a1c6cbcbdfb9f91302ba27
+  enigmail-2.0.10.tar.gz.asc: fb1eba7dc89be09fb0cea304517ff70c26f4b601
+  es-AR.xpi: 1dd8ee77b82c6c08e368b3980a5f3c52d2c0d549
+  es-ES.xpi: c030794c17ce522629179fd848928f8b50434fd5
+  et.xpi: 60c6ecd06f02bf6b897d97b19be6def13662b1da
+  eu.xpi: 4fd3ef0d9b927fb6f8a4736a927a5251e4cd2be8
+  fi.xpi: d16e7807c7bfbcd3137dc7bd673bd4519ce40167
+  fr.xpi: 48499a99c8c30bcfd94144297c2d130ad0dcc287
+  fy-NL.xpi: e3eeca07ab45828eead70334766d9caa669251be
+  ga-IE.xpi: ea3302c596fa6e23eb17401a5cab145d55f978a2
+  gd.xpi: 153bbb492f96c6e3456d539e2ac8d3c3194c6073
+  gl.xpi: 28b03a7f33aea1b3ee858886ab57472f7f9bba11
+  he.xpi: 0178f63d9883b8b691b6d6973082968561f17151
+  hr.xpi: 694659c67abfb9b48375709c9feab9b4462d5037
+  hu.xpi: ba570b64c20bcebdd9d3b969888eef7a10fcc3d6
+  hy-AM.xpi: 8542271415384fb9cfde7a540b5ffdcac3aca2e9
+  id.xpi: 1dafa66b7faf7b7a9738efe4521c404e86044624
+  is.xpi: ab22e2c4db1aebb46cb1bd2439de6645803a8ff9
+  it.xpi: 83f09f463fdd83a3d4d739910300369ab4cec3b1
+  ja.xpi: de3ab17b84c56836c297f087c3a80345e0162db3
+  ko.xpi: 88d3a857224b31fd2b3537749edc305b3e3f533e
+  lt.xpi: b5483d8b9b1ed307c09735cd38520f3362bdb961
+  nb-NO.xpi: ff4de6ec1247c96aa397168f7d67d2d5d721ffa4
+  nl.xpi: 3fb23e761230a04b80154556c57be62341a3e6cf
+  nn-NO.xpi: d82532e197d905df3d903cb1c9365cbe895d9f05
   pa-IN.xpi: ea454dad19df7c3bc1ddfa4a355e17082c07d90b
-  pl.xpi: 5726e3a08d7bd88e85cdca2b5a157075383d493e
-  pt-BR.xpi: c1532c4c84922ef77cd03d6e8c41dacf866b1a31
-  pt-PT.xpi: 04873851e2db633bd472508ed5103d2b588c0162
-  ro.xpi: a9335ae7ac313ac6750d32645d27ebf874171a08
-  ru.xpi: eed255c77068e294b32f28e7b36338b5cbcbb60d
-  si.xpi: f56e44e80410f1daa9c380a185477c2252accb77
-  sk.xpi: b063558e4b454af9dc1e08b9a7b2e2c0ccc3a747
-  sl.xpi: 3820788111acac212fa2e1358b60bba0b1304294
-  sq.xpi: f791a4da215b07cf54f9ff576b480760fb034b6d
-  sr.xpi: 1dba0be7a9bd0b946ade5f09684b1eb182f2ab3e
-  sv-SE.xpi: c08ddb48addaed826ae0f4014c1e7d71766fcee5
+  pl.xpi: 6d56b8caeb6daab0a100c0db1954bc6a9a067f0a
+  pt-BR.xpi: f59704f7c8d88b00eade882b4c8418e0afff73b3
+  pt-PT.xpi: 61089e59b05c687862e0b3ea1df2aa6b030f48d2
+  ro.xpi: 5ec4cf00d99e7c4bb86364159e49951f6219d550
+  ru.xpi: 356dea7a920049088662ef2f08839e543a8715f4
+  si.xpi: 0a202cf4e954fa385d119c2327824bafc80a0307
+  sk.xpi: 45373740d5ea534c8472785ff3e342508dc64ccb
+  sl.xpi: 669a9fa6a23d2bc48e4cd6ed2ee19e6c8e5447b2
+  sq.xpi: bf5579dfd24939bb638568e348a7c63ac1d85659
+  sr.xpi: c1904d0dd6a5e9d8d4e71b9f038f9664d4eab8c8
+  sv-SE.xpi: fb0366b8b25ff4cddfe89e945df9cd0f6158b8b9
   ta-LK.xpi: 16c61db0f821e1ad9f83f49784636fc46224bfd1
-  thunderbird-60.6.1.source.tar.xz: 2ad442fa775df6ee0c432fda2b69463257d476cf
-  tr.xpi: 6fd257503e8de247cf5f0afa52d214cc2f4fcb6d
-  uk.xpi: 401c9d9e10b5081ce4a287665e728d7834f124df
-  vi.xpi: 6446354b490b4233e59bc9e05b9d8ef4e4a1eda6
-  zh-CN.xpi: 176560532a31d1b4184139099eb475ff481e4a46
-  zh-TW.xpi: d0a2eda5467d04e7d41d786edd82384e59956f24
+  thunderbird-60.7.0.source.tar.xz: 23b4227d9459d2100f580af68139f6641fc24c66
+  tr.xpi: 4730cbbf9f6c3136a9c3b96a27b252eee4bac143
+  uk.xpi: 6bca539cfff13585463370b09c324745693ad556
+  vi.xpi: 70040324ddec3c0408871848ca7391ecaf8ab854
+  zh-CN.xpi: e621a9dafe8f946e021ae13d6f78a1a32e48a4c9
+  zh-TW.xpi: f194eaff1e57c891791c6bd5da48e0ff974c5a81
diff --git a/rust-1.33-build.patch b/rust-1.33-build.patch
new file mode 100644
index 0000000..7fc4131
--- /dev/null
+++ b/rust-1.33-build.patch
@@ -0,0 +1,39 @@
+diff -up thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py.rust-1.33-build thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py
+--- thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py.rust-1.33-build	2019-05-17 14:05:38.000000000 +0200
++++ thunderbird-60.7.0/servo/components/style/gecko/regen_atoms.py	2019-05-20 15:01:06.284881858 +0200
+@@ -202,6 +202,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n  '
+                  ' }}}};')
+ 
+ MACRO = '''
++/// Returns a static atom by passing the literal string it represents.
+ #[macro_export]
+ macro_rules! atom {{
+ {}
+diff -up thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs.rust-1.33-build thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs
+--- thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs.rust-1.33-build	2019-05-17 14:05:38.000000000 +0200
++++ thunderbird-60.7.0/servo/components/style/properties/properties.mako.rs	2019-05-20 15:01:06.286881852 +0200
+@@ -55,6 +55,7 @@ use style_adjuster::StyleAdjuster;
+ 
+ pub use self::declaration_block::*;
+ 
++/// Generated
+ #[cfg(feature = "gecko")]
+ #[macro_export]
+ macro_rules! property_name {
+@@ -3852,7 +3853,7 @@ impl fmt::Debug for AliasId {
+     }
+ }
+ 
+-// NOTE(emilio): Callers are responsible to deal with prefs.
++/// Callers are responsible to deal with prefs.
+ #[macro_export]
+ macro_rules! css_properties_accessors {
+     ($macro_name: ident) => {
+@@ -3875,6 +3876,7 @@ macro_rules! css_properties_accessors {
+     }
+ }
+ 
++/// Neco
+ #[macro_export]
+ macro_rules! longhand_properties_idents {
+     ($macro_name: ident) => {
diff --git a/thunderbird.spec b/thunderbird.spec
index c8d7fb3..e58586e 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -17,7 +17,7 @@
 %define objdir obj
 
 %define xpi 0
-%define enigmail_version 2.0.9
+%define enigmail_version 2.0.10
 %define enigmail_short_version %(echo %{version}| cut -d. -f1,2)
 %define enigmail_id \{847b3a00-7ab1-11d4-8f02-006008948af5\}
 
@@ -201,7 +201,7 @@
 
 Summary:	Full-featured email, RSS, and newsgroup client
 Name:		thunderbird
-Version:	60.6.1
+Version:	60.7.0
 Release:	1
 License:	MPL
 Group:		Networking/Mail
@@ -240,6 +240,7 @@ Source401:	thunderbird-l10n-template.in
 #
 # Fedora patches (Patch100+)
 #
+Patch101:	rust-1.33-build.patch
 # Debian patches (Patch200+)
 #
 Patch201:       mozilla-thunderbird-default-mailer.patch
@@ -377,6 +378,7 @@ Calendar extension for Thunderbird.
 
 %setup -q -n %{name}-%{version}
 
+%patch101 -p1 -b .rust133
 %patch201 -p1 -b .default_mail
 %patch216 -p1 -b .gdata
 %patch300 -p1 -b .progname
@@ -480,7 +482,10 @@ ac_add_options --enable-optimize="-O2"
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pie
 %ifarch x86_64 aarch64
-ac_add_options --enable-rust-simd
+# ERROR: --enable-rust-simd does not work with Rust 1.33 or later. 
+# See https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 .
+# ac_add_options --enable-rust-simd
+
 %endif
 EOF
 
@@ -695,5 +700,3 @@ fi
 %files lightning
 %{tbextdir}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 %{tbdistextdir}/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
-
-