diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
index 8d1a5f259..d31eb5bb3 100644
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -1,16 +1,15 @@
-Please answer these questions before submitting your issue. It may help !
-
-Thanks!
-
-1. What version of ejabberd are you using ?
+> What version of ejabberd are you using?
 
 
-2. What operating system are you using ?
+
+> What operating system (version) are you using?
 
 
-3. How did you install ejabberd (source, package, distribution) ?
+
+> How did you install ejabberd (source, package, distribution)?
 
 
-4. What did not work as expected ? What that error in the log ?
-   What that unexpected behaviour ? What was the expected result ?
+
+> What did not work as expected? Are there error messages in the log? What
+> was the unexpected behavior? What was the expected result?
 
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 554cad4b6..643d025d0 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -1,23 +1,20 @@
-We are open to contribution for ejabberd, as Github pull requests (PR).
-Here is a few points to consider before submitting your pull request.
-(You can remove the whole text after reading).
+We are open to contributions for ejabberd, as GitHub pull requests (PR).
+Here are a few points to consider before submitting your PR. (You can
+remove the whole text after reading.)
 
-1. Does this PR address an issue ?
-   Please reference it in PR description.
+1. Does this PR address an issue? Please reference it in the PR
+   description.
 
-2. Have you properly described the proposed changed ?
+2. Have you properly described the proposed change?
 
-3. Please, make sure the change is atomic and does only touch the
-   needed modules.
-   If you have other changes / fixes to provide, please make them as
-   separate PR.
+3. Please make sure the change is atomic and does only touch the needed
+   modules. If you have other changes/fixes to provide, please submit
+   them as separate PRs.
 
-4. If you change or new feature involves backends,
-   did you make sure you change is compliant with all backends or
-   provide the feature for all backends ?
-   
-5. Do you provides tests ?
-   How can we check the behaviour of the code ?
+4. If your change or new feature involves storage backends, did you make
+   sure your change works with all backends?
 
-6. Did you consider documentation changes on project
-   processone/docs.ejabberd.im ?
+5. Do you provide tests? How can we check the behavior of the code?
+
+6. Did you consider documentation changes in the
+   processone/docs.ejabberd.im repository?