diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index fda89b9f90..3fc08e5027 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -256,7 +256,6 @@ public class FragmentCompose extends FragmentBase {
     private TextView tvPlainTextOnly;
     private EditTextCompose etBody;
     private ImageView ivMarkdown;
-    private ImageButton ibTemplate;
     private TextView tvNoInternet;
     private TextView tvSignature;
     private CheckBox cbSignature;
@@ -416,7 +415,6 @@ public class FragmentCompose extends FragmentBase {
         tvPlainTextOnly = view.findViewById(R.id.tvPlainTextOnly);
         etBody = view.findViewById(R.id.etBody);
         ivMarkdown = view.findViewById(R.id.ivMarkdown);
-        ibTemplate = view.findViewById(R.id.ibTemplate);
         tvNoInternet = view.findViewById(R.id.tvNoInternet);
         tvSignature = view.findViewById(R.id.tvSignature);
         cbSignature = view.findViewById(R.id.cbSignature);
@@ -817,14 +815,6 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
-        ibTemplate.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
-        ibTemplate.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onMenuAnswerInsert(v);
-            }
-        });
-
         if (compose_color != Color.TRANSPARENT)
             tvSignature.setTextColor(compose_color);
         tvSignature.setTypeface(StyleHelper.getTypeface(compose_font, getContext()));
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 7a2ab1571d..d04f9503a0 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -360,18 +360,6 @@
                     app:srcCompat="@drawable/twotone_data_array_24"
                     app:tint="?attr/colorSeparator" />
 
-                <ImageButton
-                    android:id="@+id/ibTemplate"
-                    android:layout_width="36dp"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/menu_answers"
-                    android:padding="3dp"
-                    android:tooltipText="@string/menu_answers"
-                    app:layout_constraintBottom_toBottomOf="@id/etBody"
-                    app:layout_constraintEnd_toEndOf="@id/etBody"
-                    app:srcCompat="@drawable/twotone_text_snippet_24" />
-
                 <TextView
                     android:id="@+id/tvNoInternet"
                     android:layout_width="wrap_content"