diff --git a/.github/ISSUE_TEMPLATE/bug_report_site_issue.md b/.github/ISSUE_TEMPLATE/bug_report_site_issue.md
index bd30241..d11d1fc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_site_issue.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_site_issue.md
@@ -19,7 +19,7 @@ assignees: ''
 2. 
 3. 
 
-### Screencast
+### Screencasts/Screenshots
 <!-- If you can record your steps that lead to the problem, please include a screencast (video of the steps) or, at least, a screenshot. -->
 
 ### Actual behavior
diff --git a/README.md b/README.md
index 99fe8e9..af7ac7b 100644
--- a/README.md
+++ b/README.md
@@ -7,14 +7,14 @@
 
 <img height="200" width="200" src="assets/header.svg">
 
-This is a (Firefox) add-on (WebExtension) that allows you to autocorrect common text sequences and convert text characters to a look like a special font.
+This is a (Firefox and Thunderbird) add-on (WebExtension) that allows you to autocorrect common text sequences and convert text characters to a look like a special font.
 For instance, it converts quotes like `"these"` to `“these”`, which are typographically more correct.
 
 In contrast to many other add-ons, …
 
 It is/has/features…
 
-It is inspired by …. This extension only works with modern Firefox v78 or higher.
+It is inspired by …. This extension only works with modern Firefox and Thunderbird v78 or higher.
 
 ## Download
 
@@ -30,7 +30,7 @@ See:
 
 ## Features
 * Puts your privacy first! Privacy is the default here.
-* Follows the [Firefox Photon Design](https://design.firefox.com/photon).
+* Follows the [Firefox](https://design.firefox.com/photon) and [Thunderbird](https://style.thunderbird.net/) Photon Design.
 * Has a simple, but intuitive and usable User Interface.
 * Translated in several languages already. [Contribute your own language!](CONTRIBUTING.md#Translations)
 * Compatible with Firefox for Android
diff --git a/src/options/options.html b/src/options/options.html
index 0991d3f..23a9afa 100644
--- a/src/options/options.html
+++ b/src/options/options.html
@@ -91,6 +91,7 @@ <h1 data-i18n="__MSG_titleUnicodeAutocorrection__">Unicode autocorrection</h1>
 				</ul>
 			</section>
 
+			<!-- Remove "mobile-incompatible" once https://bugzilla.mozilla.org/show_bug.cgi?id=1595822 is fixed -->
 			<section class="mobile-incompatible">
 				<ul>
 					<h1 data-i18n="__MSG_titleContextMenu__">Context menu</h1>