diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index c5bfad3729..3852c817ff 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -22,12 +22,15 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -40,6 +43,7 @@ public class FragmentAnswer extends FragmentBase {
     private EditText etName;
     private CheckBox cbHide;
     private EditText etText;
+    private ImageButton ibInfo;
     private BottomNavigationView bottom_navigation;
     private ContentLoadingProgressBar pbWait;
     private Group grpReady;
@@ -66,10 +70,31 @@ public class FragmentAnswer extends FragmentBase {
         etName = view.findViewById(R.id.etName);
         cbHide = view.findViewById(R.id.cbHide);
         etText = view.findViewById(R.id.etText);
+        ibInfo = view.findViewById(R.id.ibInfo);
         bottom_navigation = view.findViewById(R.id.bottom_navigation);
         pbWait = view.findViewById(R.id.pbWait);
         grpReady = view.findViewById(R.id.grpReady);
 
+        ibInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Spanned spanned = HtmlHelper.fromHtml("<p>" +
+                        getString(R.string.title_answer_template_name) +
+                        "<br>" +
+                        getString(R.string.title_answer_template_email) +
+                        "</p>");
+
+                View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_message, null);
+                TextView tvMessage = dview.findViewById(R.id.tvMessage);
+
+                tvMessage.setText(spanned);
+
+                new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
+                        .setView(dview)
+                        .show();
+            }
+        });
+
         bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
diff --git a/app/src/main/res/layout/fragment_answer.xml b/app/src/main/res/layout/fragment_answer.xml
index 0d26e737ef..fa37b76f76 100644
--- a/app/src/main/res/layout/fragment_answer.xml
+++ b/app/src/main/res/layout/fragment_answer.xml
@@ -50,43 +50,21 @@
         android:hint="@string/title_answer_text"
         android:imeOptions="actionDone"
         android:inputType="textCapSentences|textMultiLine|textAutoCorrect"
+        android:isScrollContainer="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintBottom_toTopOf="@+id/vSeparatorHints"
+        android:windowSoftInputMode="adjustPan"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/vSeparator" />
 
-    <View
-        android:id="@+id/vSeparatorHints"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="6dp"
-        android:background="?attr/colorSeparator"
-        app:layout_constraintBottom_toTopOf="@+id/tvTemplateName"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/tvTemplateName"
+    <ImageButton
+        android:id="@+id/ibInfo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:text="@string/title_answer_template_name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintBottom_toTopOf="@+id/tvTemplateEmail"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/tvTemplateEmail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginBottom="6dp"
-        android:text="@string/title_answer_template_email"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:contentDescription="@string/title_setup_help"
+        android:src="@drawable/baseline_info_24"
+        app:layout_constraintBottom_toBottomOf="@id/etText"
+        app:layout_constraintEnd_toEndOf="@id/etText" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bottom_navigation"