diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index 40842b648..f36e2bc85 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -560,13 +560,13 @@ else [address appendString: email]; - url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", address]; + url = [NSString stringWithFormat: @"%@/Mail/compose?mailto=%@", + [self userFolderPath], address]; } else - url = @"Mail/compose"; - - return - [self redirectToLocation: [self relativePathToUserFolderSubPath: url]]; + url = [NSString stringWithFormat: @"%@/Mail/compose", [self userFolderPath]]; + + return [self redirectToLocation: url]; } - (id) newAction diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 95f01d730..0a87470f9 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -1173,7 +1173,7 @@ function openInbox(node) { mailboxTree.o(1); } -function initMailer(event) { log ("initMailer"); +function initMailer(event) { if (!$(document.body).hasClassName("popup")) { // initDnd(); initMailboxTree(); diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index e21b246c5..c546c7922 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -257,9 +257,10 @@ function openMailComposeWindow(url, wId) { function openMailTo(senderMailTo) { var mailto = sanitizeMailTo(senderMailTo); + if (mailto.length > 0) openMailComposeWindow(ApplicationBaseURL - + "/../Mail/compose?mailto=" + mailto); + + "../Mail/compose?mailto=" + mailto); return false; /* stop following the link */ }