diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py
index edc06fbb7..37bfe83b6 100644
--- a/modoboa/extensions/amavis/sql_listing.py
+++ b/modoboa/extensions/amavis/sql_listing.py
@@ -118,7 +118,7 @@ class SQLconnector(MBconnector):
             rs = qm["mail__msgrcpt__rs"]
             if rs == 'D':
                 continue
-            elif rs == '':
+            elif rs == ' ':
                 m["class"] = "unseen"
             elif rs == 'R':
                 m["img_rstatus"] = static_url("pics/release.png")
diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index d57b4af98..8eb7da2fb 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -128,7 +128,7 @@ def viewmail(request, mail_id):
     rcpt = request.GET["rcpt"]
     if request.user.mailbox_set.count():
         mb = Mailbox.objects.get(user=request.user)
-        if rcpt in mb.alias_addresses:
+        if rcpt == mb.full_address or rcpt in mb.alias_addresses:
             get_wrapper().set_msgrcpt_status(rcpt, mail_id, 'V')
 
     content = Template("""