$ git diff --patch-with-stat --summary bd910d327927ffa7f62c04518ceff9a6df98fff3..572f3f85c4b7b63f071f076247ecd4cb112a8efc

 .abf.yml         | 123 ++++++++++++++++++++++++-------------------------------
 thunderbird.spec |  19 ++-------
 2 files changed, 58 insertions(+), 84 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 0177b2f..b399358 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,71 +1,56 @@
-removed_sources:
-  enigmail-1.9.6.1.tar.gz: fad229409935ee38cecc671a2217ffa4074b9b4b
-  enigmail-1.9.8.2.tar.gz: 188398dbdad22fed3f482b35149ac7a17d48ecb3
-  enigmail-1.9.8.3.tar.gz: 4641f2d414148e60965ecfc508a1e04315e19d31
-  enigmail-1.9.8.tar.gz: e8e385f0224225b127d4339fedfec32e3af35366
-  enigmail-1.9.9.tar.gz: 8f254c7e995b0290c3184591da400835c3630680
-  enigmail-2.0.10.tar.gz: 5648000c5b1a35b326a1c6cbcbdfb9f91302ba27
-  enigmail-2.0.11.tar.gz: 268c6c4132973d48e6aa6c91e7c40584944f6f4e
-  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: f95da973f540171243cd670e22ec899afbe46119
-  ast.xpi: 7053c4a1d002c073f705ad3ff2e390000ad56253
-  be.xpi: 7c57d77ac5e91d4019c406ecb1ec9a3d6739030b
-  bg.xpi: 4008d5c709c213b346a6bf877ed1b725f28220d3
-  bn-BD.xpi: 517ee16d261f25248ddc950309efda97cbeeeef1
-  br.xpi: 1df1f48cffd7282035a4e13d7443c6c6263cef76
-  ca.xpi: 7176bdabf1422c34621e5f7ee9570d0b7cea74b6
+  ar.xpi: c6a2a74cdfde067dd356bf2155aaf38e7a9701d3
+  ast.xpi: 90c7a29e92f30ca66593e95d77e8577b9ebbe48f
+  be.xpi: 4e905bdcfaff8483c74176270fdef2aa4f3e9da0
+  bg.xpi: 0cac0f58b31e4ac7b74bc4b376917c1ce7dc4d74
+  br.xpi: d894de88f901bcc175ee02c02a0deb9f5c996a7c
+  ca.xpi: 42c2df9de675c20169b580a6012c931e8e0a5653
   cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
-  cs.xpi: 5bc83f195a9ae151c61c45b3608917196e4b326b
-  da.xpi: 68051455d88cc0c4f6b5e30df8b15f94f10ea810
-  de.xpi: bb80ef4f21a3c8bdf5b839609fc61547e33b899f
-  el.xpi: 18d111edbf40db160da1ab94b410c35ad5a30638
-  en-GB.xpi: f7dcf7c19deedc71b4141507272b1cb48d4e51d5
-  en-US.xpi: 7ec520f61d461f45eab07695ecdc17b1e29d3408
-  enigmail-2.1.2.tar.gz: 826412f2d0e4a945bd12271f23da70c759d58f76
-  enigmail-2.1.2.tar.gz.asc: dd8038d9b85756a6567720c861136ce456334baa
-  es-AR.xpi: a72b0e218316944ae75a0d09bdf780541a6e316a
-  es-ES.xpi: eba404ac43581bf1f49609d457e527e0a0c9d3f3
-  et.xpi: 81b285c2e6c8591e99d63e0f0d0b41faf8926346
-  eu.xpi: 8bf10946f5d73b7c8077bb2ebeaa4b7546940884
-  fi.xpi: eaede2030a6288e6c465bc9907892986f17b5a3a
-  fr.xpi: be95cad40977d2db08697165a920907b2d908576
-  fy-NL.xpi: 9ae7a6fb1adfe6ba0d472a8e449a99a02fd483cc
-  ga-IE.xpi: ad6e743f4eb6c3f7595f918abcb186a109416059
-  gd.xpi: 21f65e10693d46f94f7fe844af648f165b4ef323
-  gl.xpi: 845fe2fb3a131b6d6825bf913c8ae1a10cc72d2a
-  he.xpi: fd77364fefaea25df49cbf84307801912cc2804f
-  hr.xpi: 061a0e436b3fdc3c5045dd3bf32ed22152adebe7
-  hu.xpi: cf7c43f3ad5db25bf8fc7b70857cf006259cf883
-  hy-AM.xpi: 301048167f61b31d15928f9a4ed31016085cbad5
-  id.xpi: cfd75a9a4824091dd4fbfb3aa21589c4981b1701
-  is.xpi: 0f7e14b3836b165307ffd17e327f0790c04590bc
-  it.xpi: c816b5ff23d2ca6db9996bd6b42f5fccd5cc2c7f
-  ja.xpi: 9ed797b8ad9dc97eea7a280cab1458026daefd97
-  ko.xpi: 66bcb46349b59d9865a97eff2da1fa4f1cf13c56
-  lt.xpi: f59970fd8fa7e93a97a35887a5af00c3f57ebf8d
-  nb-NO.xpi: 045358ef5168d6b1db41181186c1b0e47962550b
-  nl.xpi: bf61b14b575d2d1fd62a4db85532f1c7c6967172
-  nn-NO.xpi: ad45a268614c272568393944e1dfdb5c5466e5b3
-  pa-IN.xpi: ea454dad19df7c3bc1ddfa4a355e17082c07d90b
-  pl.xpi: 25bd3a6f3abcc9971007df2801dbcaba6f45df2e
-  pt-BR.xpi: a6451a66d52988d7fc362b7656c810325f9c428f
-  pt-PT.xpi: 7c254a5224ba6f30600bb558865054faf3c4a6e0
-  ro.xpi: 00a80953b49f31faedebc006b44bd0b14c9c8671
-  ru.xpi: f6fb8db5894a361d3b783bf2f8565df3b57e4d76
-  si.xpi: 91e200e9e9669401c110e83a14aaf40efc99bc8e
-  sk.xpi: d86a3d389ef6f9152017b736d88469c384d175f1
-  sl.xpi: 3053fdde1c4b9200ff936fe364acef4e90a00555
-  sq.xpi: 5f0156295dd58b04dd7f2bc49cce6af94071b69d
-  sr.xpi: 7941c08a96bb638d49c7f7bd5fe92ce724c402c6
-  sv-SE.xpi: d82aa0a27c11b9a92178e248d754d84948d9a2dd
-  ta-LK.xpi: 16c61db0f821e1ad9f83f49784636fc46224bfd1
-  thunderbird-68.1.0.source.tar.xz: 1b658b8477869d59be71099c2ecb51e27da8a18f
-  tr.xpi: 7d3d3b7bd9c540cba6d9e8a3d1a73088b7976b63
-  uk.xpi: 3d7f8896651feb021c2f3c868a61083c9913d487
-  vi.xpi: 69b02a0bf984d261d49f852189f4ed5b3e8346e3
-  zh-CN.xpi: e925a3c4bc41b4b19b993243b4ccb33c554a9403
-  zh-TW.xpi: b7aab5bf14e684a1d6e12b0226f901919f614ea8
+  cs.xpi: db05c31f7e97236090055baf58b69983886c5555
+  da.xpi: 5522293487b056ff2532b6cce85cef9eb16b8506
+  de.xpi: bf02ddb4faf38e885ae1ef10d4be535c041607e2
+  el.xpi: 9872cc6a2171bfd824cdb75b25930422de81fc20
+  en-GB.xpi: ee13002db3a2015c94e83d10ecd54d851c9b3fd5
+  en-US.xpi: d9597911347da30ae613af2f7373d5f519aa84be
+  enigmail-2.1.3.tar.gz: 710d7a20b09f213c8ce2eec8055d49983a3c51d7
+  enigmail-2.1.3.tar.gz.asc: aa88d24804aa94bec6fb4de336bd79522d73f3e0
+  es-AR.xpi: 12a9edee555bfc0713247fc7a457ec2f74524a05
+  es-ES.xpi: 505cc58e8b0fe94d7ba9a14d7b67443fc740107c
+  et.xpi: 967fe2201d91afe92e3e84e9464332c515823e79
+  eu.xpi: 306cdb186df25455e983f7793bfdc6dba7014c1e
+  fi.xpi: a483d776982fb3cdb4f0477e8f95c44ddea2987c
+  fr.xpi: d81e93d9e3d5b18e7c57188a10465ca6bc57a379
+  fy-NL.xpi: 70b7ca31e48e403dd08e4ff94688f4a24ebbfc5a
+  ga-IE.xpi: b828e750d84367ab1acc3c89fce495ddd2d3bba8
+  gd.xpi: 821f822602daa4662dcb0d1fc9de6f9bf54bd00d
+  gl.xpi: 054407724b661e45437a0b6c8e0b51e8b76d6cbc
+  he.xpi: de4103747fe781faa9df03ba57ae240b828bd7c7
+  hr.xpi: f480a7209f3095e0130ef84838e3ebb8c5c7391c
+  hu.xpi: 09490b8f2fd675262d26a33c88560a742306bb68
+  hy-AM.xpi: d1e9d957eb1318d0155d42b75dc5d286df8fd65e
+  id.xpi: 6d365c53cc63e74e53d711083edb57e3750342f1
+  is.xpi: 391e122cde1e1460901387a9228931d757f13687
+  it.xpi: 83ef36c85b7193692a4d6947349f60896f1414f9
+  ja.xpi: cccdb9c59e67545af2fe94da8580f254f2bd6627
+  ko.xpi: 2f81db5d7fc510457bfcf3d80cac0d1dba1e78e8
+  lt.xpi: fab2761395f06bdbae167b56c0f1baee828eed4f
+  nb-NO.xpi: 8135800916e9706a97ff00394f098a3e8e304069
+  nl.xpi: 07ec5da963e810bc126dd4e7fbcf61593ce2eb3f
+  nn-NO.xpi: c5224a00b4325e928b6a660ec385014536eb4c98
+  pl.xpi: 4cf6b5e194a6565c88adde9429a7946e0a063062
+  pt-BR.xpi: 036ef79fd66e06a9e03a10bd19929a485078fadf
+  pt-PT.xpi: 1f49dc3a911b94870bb21a9e0648c96fe92e5f26
+  ro.xpi: 98e78d61667ebf6153d300f71c0473cd448c7b93
+  ru.xpi: c609328ead27cc42cce77c84857e1faf40c772fb
+  si.xpi: af85b8dd7186f175126364981a99d10ff1d6183b
+  sk.xpi: c815c376ff5584998ea04fd0eacbbfd8932bab9e
+  sl.xpi: 7182fb3d62cbcc867ed9eff0e67c7f4f767b338b
+  sq.xpi: bef4e1aa671c24986d494a72f7bc989db4d07ca9
+  sr.xpi: 1e002bc1ba5d0dba98de789080f85e3eacfe087b
+  sv-SE.xpi: 4f4835d389c433187982e914c0fc1ff9660bcee6
+  thunderbird-68.3.0.source.tar.xz: 1602af5c854109d939528ec14ada80103030128d
+  tr.xpi: f242dd1ca06ccb953215172c94b5dbb350960ff3
+  uk.xpi: d890a9db66ee19d7e00810f78b00e0b212765b68
+  vi.xpi: f52d36356c04955061c42979ec2a1f0c14e3ece1
+  zh-CN.xpi: fa0a02e408c2ab70104d9398413fbee0470aba20
+  zh-TW.xpi: 434155818997ba712354f505deaab4865fd0ef2c
diff --git a/thunderbird.spec b/thunderbird.spec
index e7d8a10..b368a40 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -17,12 +17,11 @@
 %define objdir obj
 
 %define xpi 0
-%define enigmail_version 2.1.2
+%define enigmail_version 2.1.3
 %define enigmail_short_version %(echo %{version}| cut -d. -f1,2)
 %define enigmail_id \{847b3a00-7ab1-11d4-8f02-006008948af5\}
 
 %define lightning_id \{e2fda1a4-762b-4020-b5ad-a41df1933103\}
-%define gdata_id  \{a62ef8ec-5fdc-40c2-873c-223b8a6925cc\}
 
 %define _provides_exceptions libgtkembedmoz.so\\|libxpcom.so
 %define _requires_exceptions libgtkembedmoz.so\\|libxpcom.so
@@ -204,7 +203,7 @@
 
 Summary:	Full-featured email, RSS, and newsgroup client
 Name:		thunderbird
-Version:	68.1.0
+Version:	68.3.0
 Release:	1
 License:	MPL
 Group:		Networking/Mail
@@ -568,21 +567,12 @@ install -m 644 %{buildroot}/%{tbdir}/chrome/icons/default/default128.png %{build
 
 mkdir -p %{buildroot}%{tbextdir}/%{enigmail_id}
 %if !%{xpi}
-%{_bindir}/unzip -q extensions/enigmail/build/enigmail-*.xpi -d %{buildroot}%{tbextdir}/%{enigmail_id}
+%{_bindir}/unzip -q extensions/enigmail/build-tb/enigmail-*.xpi -d %{buildroot}%{tbextdir}/%{enigmail_id}
 %{__chmod} 644 %{buildroot}%{tbextdir}/%{enigmail_id}/chrome.manifest
 %else
-cp -aL extensions/enigmail/build/enigmail-%{enigmail_short_version}*.xpi %{buildroot}%{tbextdir}/%{enigmail_id}/%{enigmail_id}.xpi
+cp -aL extensions/enigmail/build-tb/enigmail-%{enigmail_short_version}*.xpi %{buildroot}%{tbextdir}/%{enigmail_id}/%{enigmail_id}.xpi
 %endif
 
-#===============================================================================
-# lightning ext here
-pushd %{objdir}/dist/xpi-stage/
-  for ext in {gdata-provider,}; do
-    mkdir -p %buildroot%{tbextdir}/%{gdata_id}
-    %{_bindir}/unzip -q ${ext}.xpi -d %buildroot%{tbextdir}/%{gdata_id}/
-  done
-popd
-
 #==============================================================================
 #exclude devel files
 rm -rf %{buildroot}%{_datadir}/idl/%{oname}-%{version}
@@ -719,5 +709,4 @@ fi
 %{tbextdir}/%{enigmail_id}
 
 %files lightning
-%{tbextdir}/%{gdata_id}
 %{tbdistextdir}/%{lightning_id}.xpi