diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
index 863b1114..87b98853 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
@@ -274,7 +274,7 @@ ${(message.subject) ? wtvshared.htmlEntitize(message.subject) : '(No subject)'}
                 if (typeof message.body === "object" && message.body) {
                     message.body = wtvshared.decodeBufferText(message.body);
                 }
-                message.body = message.body.replace(/\n/g, "<br><br>");
+                if (message.body) message.body = message.body.replace(/\n/g, "<br><br>");
                 data += `${(message.allow_html) ? message.body : wtvshared.htmlEntitize(message.body, true)}
 <br>
 <br>`;
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
index b0509cd3..ff6574e6 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
@@ -6,6 +6,7 @@ var intro_seen = session_data.mailstore.checkMailIntroSeen();
 if (!intro_seen && !request_headers.query.intro_seen) {
     // user is trying to bypass the intro screen
     headers = "300 OK\nLocation: wtv-mail:/DiplomaMail?came-from=" + encodeURIComponent(request_headers.request_url);
+} else if (request_headers.query.clear == "true") {
 } else if (request_headers.query.clear == "true") {
     if (request_headers.Referer)
         gourl = request_headers.Referer.replace(/[\?\&]clear\=true/, '');
@@ -125,7 +126,7 @@ Content-Type: audio/wav`;
 
         var username = session_data.getSessionData("subscriber_username");
         var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name"));
-        var address = username + "@" + minisrv_config.config.domain_name
+        var address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name
         var notImplementedAlert = new clientShowAlert({
             'image': minisrv_config.config.service_logo,
             'message': "This feature is not available.",