diff --git a/.github/ISSUE_TEMPLATE/mu4e-feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/mu4e-feature-request.md
rename to .github/ISSUE_TEMPLATE/feature-request.md
diff --git a/.github/ISSUE_TEMPLATE/misc.md b/.github/ISSUE_TEMPLATE/misc.md
new file mode 100644
index 00000000..7f942cdc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/misc.md
@@ -0,0 +1,16 @@
+---
+name: Misc
+about: Miscellaneous items you want to share
+title: "[misc]"
+labels: new
+assignees: ''
+
+---
+
+**Note**: for questions, please use the mailing-list: https://groups.google.com/g/mu-discuss
+
+**Describe the issue**
+A clear and concise description, i.e. what you expected/desired to happen and what actually happened.
+
+**Environment**
+If applicable, please describe the versions of OS, Emacs, mu etc. you are using.
diff --git a/.github/ISSUE_TEMPLATE/mu-bug-report.md b/.github/ISSUE_TEMPLATE/mu-bug-report.md
new file mode 100644
index 00000000..ef4af132
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/mu-bug-report.md
@@ -0,0 +1,20 @@
+---
+name: Mu4e Bug Report
+about: Create a report to help us improve
+title: "[mu4e bug]"
+labels: bug, mu4e, new
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is, what you expected to happen and what actually happened.
+
+**To Reproduce**
+Detailed steps to reproduce the behavior. If this is about a specific (kind of) message, **always** attach an (anonymized as need) example message.
+
+**Environment**
+Please describe the versions of OS, Emacs, mu etc. you are using.
+
+**Checklist**
+- [ ] you are running either the latest 1.4.x release, or a 1.5.11+ development release (otherwise, please upgrade).
diff --git a/.github/ISSUE_TEMPLATE/mu4e-bug-report.md b/.github/ISSUE_TEMPLATE/mu4e-bug-report.md
index 0c646a6d..56d740b7 100644
--- a/.github/ISSUE_TEMPLATE/mu4e-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/mu4e-bug-report.md
@@ -8,13 +8,13 @@ assignees: ''
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is, what you excepted to happen and what actually happened.
+A clear and concise description of what the bug is, what you expected to happen and what actually happened.
 
 **To Reproduce**
 Detailed steps to reproduce the behavior. If this is about a specific (kind of) message, **always** attach an (anonymized as need) example message.
 
 **Environment**
-Please describe the versions of OS, Emacs, mu4e etc. you are using.
+Please describe the versions of OS, Emacs, mu/mu4e etc. you are using.
 
 **Checklist**
 - [ ] you are running vanilla emacs (i.e. without Doom, Evil, Spacemacs etc.) (otherwise, please try to reproduce without those