diff --git a/lib/api/addresses.js b/lib/api/addresses.js
index 3b23eaa8..d28cdf31 100644
--- a/lib/api/addresses.js
+++ b/lib/api/addresses.js
@@ -167,7 +167,7 @@ module.exports = (db, server) => {
             }
 
             db.users.collection('addresses').findOne({
-                addrview: address.replace(/\./g, '')
+                addrview: address.substr(0, address.indexOf('@')).replace(/\./g, '') + address.substr(address.indexOf('@'))
             }, (err, addressData) => {
                 if (err) {
                     res.json({
@@ -186,7 +186,7 @@ module.exports = (db, server) => {
                 db.users.collection('addresses').insertOne({
                     user,
                     address,
-                    addrview: address.replace(/\./g, ''),
+                    addrview: address.substr(0, address.indexOf('@')).replace(/\./g, '') + address.substr(address.indexOf('@')),
                     created: new Date()
                 }, (err, r) => {
                     if (err) {
diff --git a/package.json b/package.json
index c6a5f0b0..ab97b7e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "wildduck",
-    "version": "1.0.64",
+    "version": "1.0.65",
     "description": "IMAP server built with Node.js and MongoDB",
     "main": "server.js",
     "scripts": {