diff --git a/mail/base/content/commandglue.js b/mail/base/content/commandglue.js index 87963c293e4e..6239b44db2d2 100644 --- a/mail/base/content/commandglue.js +++ b/mail/base/content/commandglue.js @@ -226,6 +226,7 @@ function ChangeFolderByURI(uri, viewType, viewFlags, sortType, sortOrder) gRerootOnFolderLoad = true; try { + ClearThreadPane(); SetBusyCursor(window, true); msgfolder.startFolderLoading(); msgfolder.updateFolder(msgWindow); diff --git a/mail/base/jar.mn b/mail/base/jar.mn index 81943b013362..ced363fada0c 100644 --- a/mail/base/jar.mn +++ b/mail/base/jar.mn @@ -35,6 +35,11 @@ toolkit.jar: en-US.jar: ++ locale/en-US/messenger/start.html (locale/start.html) + locale/en-US/messenger/bird.png (locale/bird.png) + locale/en-US/messenger/h1.png (locale/h1.png) + locale/en-US/messenger/h2.png (locale/h2.png) + locale/en-US/messenger/back.png (locale/back.png) + locale/en-US/messenger/messenger.dtd (locale/messenger.dtd) + locale/en-US/messenger/mailTasksOverlay.dtd (locale/mailTasksOverlay.dtd) + locale/en-US/messenger/msgAccountCentral.dtd (locale/msgAccountCentral.dtd) diff --git a/mail/base/locale/back.png b/mail/base/locale/back.png new file mode 100644 index 000000000000..2776c20555e3 Binary files /dev/null and b/mail/base/locale/back.png differ diff --git a/mail/base/locale/bird.png b/mail/base/locale/bird.png new file mode 100644 index 000000000000..47aabdd03503 Binary files /dev/null and b/mail/base/locale/bird.png differ diff --git a/mail/base/locale/h1.png b/mail/base/locale/h1.png new file mode 100644 index 000000000000..4af5f1af0bbc Binary files /dev/null and b/mail/base/locale/h1.png differ diff --git a/mail/base/locale/h2.png b/mail/base/locale/h2.png new file mode 100644 index 000000000000..3627df4bbfa0 Binary files /dev/null and b/mail/base/locale/h2.png differ diff --git a/mail/base/locale/region.properties b/mail/base/locale/region.properties index 08033cfb67ff..4cff6448e57d 100644 --- a/mail/base/locale/region.properties +++ b/mail/base/locale/region.properties @@ -1,7 +1,7 @@ # # messenger.properties # mailnews.js -mailnews.start_page.url=http://www.mozilla.org/projects/thunderbird/ +mailnews.start_page.url=chrome://messenger/locale/start.html mailnews.release_notes.url=http://www.mozilla.org/projects/thunderbird/ mailnews.hints_and_tips.url=http://texturizer.net/thunderbird/ messenger.throbber.url=http://www.mozilla.org/projects/thunderbird/ diff --git a/mail/base/locale/start.html b/mail/base/locale/start.html new file mode 100644 index 000000000000..cf37b6b75769 --- /dev/null +++ b/mail/base/locale/start.html @@ -0,0 +1,102 @@ + + + + + + + +Welcome to Thunderbird™ Mail! + + + + + + + + + + +

Welcome to Thunderbird™ Mail!

+
+

Thunderbird™ Mail is a powerful open-source mail and news client supporting advanced junk mail detection and other useful features.

+

Features

+ +

More Information

+

For frequently asked questions, tips and general help visit Thunderbird™ Help.

+

For Thunderbird™ Mail development information, visit the Thunderbird™ Mail Project Page. +

Powered by Gecko.
+
+ + + diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js index 3823dedf4513..20b6c1557edb 100644 --- a/mail/components/compose/content/MsgComposeCommands.js +++ b/mail/components/compose/content/MsgComposeCommands.js @@ -2146,6 +2146,20 @@ function AddAttachment(attachment) if (!attachment.name) attachment.name = gMsgCompose.AttachmentPrettyName(attachment.url); + + // for security reasons, don't allow *-message:// uris to leak out + // we don't want to reveal the .slt path (for mailbox://), or the username or hostname + var messagePrefix = /^mailbox-message:|^imap-message:|^news-message:/i; + if (messagePrefix.test(attachment.name)) + attachment.name = sComposeMsgsBundle.getString("messageAttachmentSafeName"); + else { + // for security reasons, don't allow mail protocol uris to leak out + // we don't want to reveal the .slt path (for mailbox://), or the username or hostname + var mailProtocol = /^mailbox:|^imap:|^s?news:/i; + if (mailProtocol.test(attachment.name)) + attachment.name = sComposeMsgsBundle.getString("partAttachmentSafeName"); + } + item.setAttribute("label", attachment.name); //use for display only item.attachment = attachment; //full attachment object stored here try { diff --git a/mail/config/basemail-win b/mail/config/basemail-win index 553ff70276d8..cf1de53b6834 100644 --- a/mail/config/basemail-win +++ b/mail/config/basemail-win @@ -147,6 +147,9 @@ components\xuldoc.xpt ; Imaging: mozz.dll components\imglib2.dll +components\imgicon.dll +components\imgicon.xpt +compontents\imglib2.xpt ; accessibility (out of process API support) components\accessibility.dll