When forwarding an email, pre-load its attachments.

[citadel.git] / webcit-ng / static / js / view_mail.js

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 6d6fbcf45f1a8103f7c24b12e5a9546452f39139..f1596dcae7c5a5425cf08f080cd1c33ddf4ae799 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -216,8 +216,8 @@ function mail_render_one(msgnum, msg, target_div, include_controls) {
                          "</div>";                                             // end header
                }
 
-               // Display attachments, if any are present
-               if (msg.part) {
+               // Display attachments, if any are present (don't do this if we're quoting the message)
+               if ( (msg.part) && (include_controls) ) {
                        let display_attachments = 0;
                        for (let r=0; r<msg.part.length; ++r) {
                                if (msg.part[r].disp == "attachment") {
@@ -562,8 +562,10 @@ function mail_compose(references, quoted_msgnum, m_to, m_cc, m_subject) {
        if (is_quoted) {
                mail_display_message(quoted_msgnum, document.getElementById(quoted_div_name), 0);
        }
+
+       // If this is a forwarded messages, preload its attachments into the forwarded copy.
        if (is_fwd) {
-               console.log("FIXME we have to load the attachments from message " + quoted_msgnum);
+               forward_attachments(quoted_msgnum);
        }
 
        if (is_reply) {