diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java
index bc95466640..bb7179097d 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySignature.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java
@@ -31,6 +31,8 @@ import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
@@ -50,12 +52,17 @@ public class ActivitySignature extends ActivityBase {
     private BottomNavigationView style_bar;
     private BottomNavigationView bottom_navigation;
 
+    private boolean raw = false;
+
     private static final int REQUEST_IMAGE = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (savedInstanceState != null)
+            raw = savedInstanceState.getBoolean("fair:raw");
+
         getSupportActionBar().setSubtitle(getString(R.string.title_edit_signature));
         setContentView(R.layout.activity_signature);
 
@@ -110,6 +117,33 @@ public class ActivitySignature extends ActivityBase {
         load();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        outState.putBoolean("fair:raw", raw);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_signature, menu);
+        return true;
+
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_edit_html:
+                item.setChecked(!item.isChecked());
+                raw = item.isChecked();
+                load();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -130,6 +164,8 @@ public class ActivitySignature extends ActivityBase {
         String html = getIntent().getStringExtra("html");
         if (html == null)
             etText.setText(null);
+        else if (raw)
+            etText.setText(html);
         else
             etText.setText(HtmlHelper.fromHtml(html, new Html.ImageGetter() {
                 @Override
@@ -148,7 +184,7 @@ public class ActivitySignature extends ActivityBase {
 
     private void save() {
         etText.clearComposingText();
-        String html = HtmlHelper.toHtml(etText.getText());
+        String html = (raw ? etText.getText().toString() : HtmlHelper.toHtml(etText.getText()));
         Intent result = new Intent();
         result.putExtra("html", html);
         setResult(RESULT_OK, result);
diff --git a/app/src/main/res/menu/menu_signature.xml b/app/src/main/res/menu/menu_signature.xml
new file mode 100644
index 0000000000..b9cdde07aa
--- /dev/null
+++ b/app/src/main/res/menu/menu_signature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_edit_html"
+        android:checkable="true"
+        android:title="@string/title_edit_html"
+        app:showAsAction="never" />
+</menu>