diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 405cc9f320..ebe39c7b8f 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,33 +1,41 @@
-<!--
-Please note this is a bug tracker, not a support forum. If you need support, please use
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to get all the necessary data to fix your issue.
+You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
+
+Before we begin, please note that this tracker is only for issues, not questions or comments.
+
+If you are looking for support, please see our support center instead:
 http://support.whispersystems.org/
 or email support@whispersystems.org
 
-Delete any sections that aren't relevant.
--->
+Let's begin with a checklist: replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 
-<!-- mark with x between the [ ] -->
 I have:
 - [ ] searched open and closed issues for duplicates
 - [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
 
+----------------------------------------
+
 ### Bug description
+Describe here the issue that you are experiencing.
 
 ### Steps to reproduce
-- add your steps here
-- as a list
-- using hyphens
+- using hyphens as bullet points
+- list the steps
+- that reproduce the bug
+
+**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
+**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
 
 ### Screenshots
-<!-- Drag and drop images here, or post a link -->
+<!-- you can drag and drop images below -->
+
 
 ### Device info
-<!-- Replace examples with your info -->
- **Model:** Manufacturer Model XVI
-
- **Android version:** 0.0.0
-
- **Signal version:** 0.0.0
+<!-- replace the examples with your info -->
+**Device:** Manufacturer Model XVI
+**Android version:** 0.0.0
+**Signal version:** 0.0.0
 
 ### Link to debug log
+<!-- immediately after the bug has happened capture a debug log via Signal's advanced settings and paste the link below -->
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 1bae5c5f47..7cdbf08e9a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,23 @@
-<!-- You can remove this section if you have contributed before -->
+<!-- You can remove this first section if you have contributed before -->
 ### First time contributor checklist
-<!-- mark with x between the brackets -->
+<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I have read [how to contribute](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md) to this project
 - [ ] I have signed the [Contributor Licence Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
-<!-- mark with x between the brackets -->
+<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
 - [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines)
 - [ ] I have tested my contribution on these devices:
  * Device A, Android X.Y.Z
  * Device B, Android Z.Y
+ * Virtual device W, Android Y.Y.Z
 - [ ] My contribution is fully baked and ready to be merged as is
-- [ ] I have made the choice whether I want the Bithub reward or not by omitting or adding the word `FREEBIE` in my commit message
+- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in my commit message
 
 ----------
 
 ### Description
+<!--
+Describe briefly what your pull request proposes to fix. Especially if you have more than one commit, it is helpful to give a summary of what your contribution as a whole is trying to solve. You can also use the `fixes #1234` syntax to refer to specific issues either here or in your commit message.
+Also, please describe shortly how you tested that your fix actually works.
+-->