summaryrefslogtreecommitdiff
path: root/skins/default/templates
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
committeralecpl <alec@alec.pl>2011-11-11 15:04:45 +0000
commitecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce (patch)
tree2a19876b7daee9b036fbab5cc7317402b2dd0f57 /skins/default/templates
parentc82bf6689f47073342f4c42502f75bcaf17e6130 (diff)
- Apply fixes fom trunk up to r5414
Diffstat (limited to 'skins/default/templates')
-rw-r--r--skins/default/templates/message.html3
-rw-r--r--skins/default/templates/messagepreview.html2
2 files changed, 2 insertions, 3 deletions
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 8e2bb2cb3..714540b78 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -36,8 +36,7 @@
<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
<roundcube:object name="messageFullHeaders" id="full-headers" />
<roundcube:object name="messageAttachments" id="attachment-list" />
-
-<roundcube:object name="blockedObjects" id="remote-objects-message" />
+<roundcube:object name="messageObjects" id="message-objects" />
<roundcube:object name="messageBody" id="messagebody" />
</div>
<div class="boxfooter">
diff --git a/skins/default/templates/messagepreview.html b/skins/default/templates/messagepreview.html
index bfd7d7d92..a606311e1 100644
--- a/skins/default/templates/messagepreview.html
+++ b/skins/default/templates/messagepreview.html
@@ -13,7 +13,7 @@
<roundcube:object name="messageAttachments" id="attachment-list" />
</div>
-<roundcube:object name="blockedObjects" id="remote-objects-message" />
+<roundcube:object name="messageObjects" id="message-objects" />
<roundcube:object name="messageBody" id="messagebody" />
</body>