diff --git a/Keyserver-less-OpenPGP.md b/Keyserver-less-OpenPGP.md
index bad175c..bb28a85 100644
--- a/Keyserver-less-OpenPGP.md
+++ b/Keyserver-less-OpenPGP.md
@@ -9,7 +9,10 @@ This does not discuss trust, only key discovery!
 
 [The "OpenPGP" mail and news header field](https://tools.ietf.org/html/draft-josefsson-openpgp-mailnews-header-07)
 
-
-TODOs:
-* Enable header ``OpenPGP: preference=signencrypt`` in all email clients
-* Put into bug tracker of Enigmail, KMail, etc
\ No newline at end of file
+Tracking in email client bug trackers:
+* [Enigmail](https://sourceforge.net/p/enigmail/bugs/627/)
+* KMail
+* gpg4o
+* GPGOL
+* GPGTools
+* r2mail2