diff --git a/FAQ.md b/FAQ.md
index 2da35014dc..cef3e9c7df 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -333,6 +333,7 @@ Fonts, sizes, colors, etc should be material design whenever possible.
* [(176) When will a message be considered safely transported?](#user-content-faq176)
* [(177) What does 'Sensitivity' mean?](#user-content-faq177)
* [(178) Why are widgets not updating?](#user-content-faq178)
+* [(179) What are reply templates?](#user-content-faq179)
[I have another question.](#user-content-get-support)
@@ -4608,6 +4609,24 @@ Please see [this video](https://www.youtube.com/watch?v=ywQrYJ6rtnM) about how t
+
+**(179) What are reply templates?**
+
+Reply templates are predefined answer texts.
+
+You can reply with a template, insert a template via the three-dots overflow menu in the message editor,
+and long press on an open space to insert a snippet (the latter requires Android 6 Marshmallow or later).
+
+Templates can have the following options:
+
+* *Default*: template to use when writing a new message
+* *Use as read receipt*: template to use instead of the default read receipt text
+* *Favorite*: template will be added in the main reply popup menu
+* *Snippet*: template will be used as text fragment (since version 1.1857)
+* *Hide from menus*: template will be hidden (disabled)
+
+
+
Get support
🌎 [Google Translate](https://translate.google.com/translate?sl=en&u=https://github.com/M66B/FairEmail/blob/master/FAQ.md%23user-content-get-support)
diff --git a/README.md b/README.md
index 988ec5fa93..150788bb40 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ All pro features are convenience or advanced features.
* Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))
* Send messages after selected time
* Synchronization scheduling ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq78))
-* Reply templates
+* Reply templates ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq179))
* Accept/decline calendar invitations
* Add message to calendar
* Filter rules ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq71))
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 307e3bc717..381ed5b4fe 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -291,7 +291,10 @@ public class FragmentAnswer extends FragmentBase {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int itemId = item.getItemId();
- if (itemId == R.id.menu_placeholder_name) {
+ if (itemId == R.id.menu_help) {
+ onMenuHelp();
+ return true;
+ } else if (itemId == R.id.menu_placeholder_name) {
onMenuPlaceholder("$name$");
return true;
} else if (itemId == R.id.menu_placeholder_email) {
@@ -307,6 +310,10 @@ public class FragmentAnswer extends FragmentBase {
return super.onOptionsItemSelected(item);
}
+ private void onMenuHelp() {
+ Helper.viewFAQ(getContext(), 179);
+ }
+
private void onMenuPlaceholder(String name) {
int start = etText.getSelectionStart();
int end = etText.getSelectionEnd();
diff --git a/app/src/main/res/menu/menu_answer.xml b/app/src/main/res/menu/menu_answer.xml
index 6aed0e6574..e67f06548f 100644
--- a/app/src/main/res/menu/menu_answer.xml
+++ b/app/src/main/res/menu/menu_answer.xml
@@ -1,5 +1,11 @@
-