diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6fffc8c..b819e0a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,4 @@
+> This v1.0 template stands in `.github/`.
 
 ### General informations
 
@@ -6,20 +7,22 @@
 - CLI options:
 
 ```
-<configuration file goes here>
+Configuration file offlineimaprc goes here. REMOVE PRIVATE DATA.
 ```
 
 ```
-<pythoonfile file goes here (if any)>
+The pythonfile file goes here (if any). REMOVE PRIVATE DATA.
 ```
 
 
 ### Log error
 
 ```
-<error goes here>
+Logs go here. REMOVE PRIVATE DATA.
 ```
 
 ### Steps to reproduce the error
 
+- 
+- 
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ed6face..f41dae2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,29 @@
+> This v1.0 template stands in `.github/`.
 
-> Add character x.
+### Peer reviews
+
+Trick to [fetch the pull
+request](https://help.github.com/articles/checking-out-pull-requests-locally):
+there is a (read-only) `refs/pull/` namespace.
+
+``` bash
+git fetch OFFICIAL_REPOSITORY_NAME pull/PULL_ID/head:LOCAL_BRANCH_NAME
+```
+
+### This PR
+
+> Add character x `[x]`.
 
 - [] I've read the [DCO](http://www.offlineimap.org/doc/dco.html).
 - [] I've read the [Coding Guidelines](http://www.offlineimap.org/doc/CodingGuidelines.html)
-- [] The relevant informations about the changes stands in the commit message, not here.
+- [] The relevant informations about the changes stands in the commit message, not here in the message of the pull request.
 - [] Code changes follow the style of the files they change.
 - [] Code is tested (provide details).
 
 ### References
 
-- Bug: #no_space
+- Issue #no_space
+
+### Additional information
+