* apply R8157 from the dav-rework branch:

[citadel.git] / webcit / static / t / view_message_replyquote.html

diff --git a/webcit/static/t/view_message_replyquote.html b/webcit/static/t/view_message_replyquote.html
index dc07d15d5b7b486488553edebaff7cd133c24f52..8e5ca6aaa0d8af63d644fd96be215ebe5646c674 100644 (file)
--- a/webcit/static/t/view_message_replyquote.html
+++ b/webcit/static/t/view_message_replyquote.html
@@ -1,15 +1,14 @@
-<br><blockquote>
-<div class="message_header">
-  <span><?MAIL:SUMM:DATESTR></span>
-  <span><?_("from ")>
-    <??("COND:MAIL:ANON",1)><?MAIL:SUMM:FROM("X")><??("X", 1)>
-    <?!("COND:MAIL:ANON",2)>***<??("X", 2)>
-  </span>
-  <p class="message_subject"><?MAIL:SUMM:SUBJECT></p>
-</div>
+<blockquote> <div class="message_header"> <span><?MAIL:SUMM:DATEFULL></span> 
 
-<div class="message_content">
-<?MAIL:BODY>    
+<??("COND:MAIL:ANON",1)>
+<span><?_("from ")>
+<?!("COND:MAIL:SUMM:RFCA", 2)>"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;<?!("X", 2)>
+<??("COND:MAIL:SUMM:RFCA", 3)><?MAIL:SUMM:FROM("X")><??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",4)> @ <?MAIL:SUMM:H_NODE><??("X",4)>
+</span>
+<?!("COND:MAIL:ANON",5)><span><?_("from ")>***</span><??("X", 5)>
+<?!("COND:MAIL:SUBJ",6)><span class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT></span><?!("X", 6)>
+</div><?ITERATE("MAIL:MIME:ATTACH:ATT", "load_attachments")>  
+ <div class="message_content"> <?MAIL:BODY>
+ <?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 10)><?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")><?!("X", 10)>
 </div>
-
 </blockquote>