Fix bug #3574: Template addressing

[claws.git] / src / prefs_template.c

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 732c7cf6312779ce57e0b102be497e1285fd3a15..9e2f28e719b39716d71255dd007031185598dcca 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -317,7 +317,7 @@ static void prefs_template_window_create(void)
        CLAWS_SET_TIP(subst_btn,
                        _("Replace the selected template in list with the template above"));
 
-       del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+       del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
        gtk_button_set_image(GTK_BUTTON(del_btn),
                        gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
        gtk_widget_show(del_btn);
@@ -716,16 +716,6 @@ gboolean prefs_template_string_is_valid(gchar *string, gint *line, gboolean esca
                                *line = quote_fmt_get_line();
                        return FALSE;
                }
-               if (email) {
-                       const gchar *start = strrchr(parsed_buf, '<');
-                       const gchar *end = strrchr(parsed_buf, '>');
-                       const gchar *at = strrchr(parsed_buf, '@');
-                       const gchar *space = strrchr(parsed_buf, ' ');
-                       if (!at)
-                               result = FALSE;
-                       if (at && space && (!start || !end || end < start || start < space))
-                               result = FALSE;
-               }
                quote_fmt_reset_vartable();
        }
        return result;