[Fix] Fix setting of email address

diff --git a/rules/misc.lua b/rules/misc.lua
index 20505828bbf3ed87ae37a499fa0be1c69c244ed1..ccc52d8870c8547ed316f211733d67861797abc9 100644 (file)
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -415,8 +415,8 @@ local aliases_id = rspamd_config:register_symbol{
         addr.addr = string.format('%s@', addr.user)
       end
 
-      if addr.name then
-        addr.raw = string.format('%s <%s>', addr.name, addr.addr)
+      if addr.name and #addr.name > 0 then
+        addr.raw = string.format('"%s" <%s>', addr.name, addr.addr)
       else
         addr.raw = string.format('<%s>', addr.addr)
       end

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 2ed2419e2ef05158e0dfce73f19c19fa4a6a7cce..9edfd39d4b173ccb7f4f4e0a102e58bc9a73b20e 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -2076,7 +2076,7 @@ lua_import_email_address (lua_State *L, struct rspamd_task *task,
                p = lua_tolstring (L, -1, &len);
                addr->name = (const gchar *)rspamd_mempool_alloc (task->task_pool, len);
                memcpy ((gchar *)addr->name, p, len);
-               addr->addr_len = len;
+               addr->name_len = len;
        }
 
        lua_pop (L, 1);
@@ -2152,6 +2152,7 @@ lua_import_email_address (lua_State *L, struct rspamd_task *task,
        }
 
        lua_pop (L, 1);
+       addr->flags = RSPAMD_EMAIL_ADDR_VALID;
 
        *paddr = addr;