- Fix inconsistent behaviour of Compose button in Drafts folder, add Edit button for drafts

5 files changed, 17 insertions, 12 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 192de065a..6bf8e9032 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -230,7 +230,7 @@ img
 }
 
 #message div.notice,
-#remote-objects-message
+#message-objects div.notice
 {
   background: url(images/display/icons.png) 6px 3px no-repeat;
   background-color: #F7FDCB;
@@ -238,21 +238,25 @@ img
 }
 
 #message div.error,
-#message div.warning
+#message div.warning,
+#message-objects div.warning,
+#message-objects div.error
 {
   background: url(images/display/icons.png) 6px -97px no-repeat;
   background-color: #EF9398;
   border: 1px solid #DC5757;
 }
 
-#message div.confirmation
+#message div.confirmation,
+#message-objects div.confirmation
 {
   background: url(images/display/icons.png) 6px -47px no-repeat;
   background-color: #A6EF7B;
   border: 1px solid #76C83F;
 }
 
-#message div.loading
+#message div.loading,
+#message-objects div.loading
 {
   background: url(images/display/loading.gif) 6px 3px no-repeat;
   background-color: #EBEBEB;
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index 5da6e7aa9..dc7f24a2e 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -20,7 +20,10 @@ img
 #message div.error,
 #message div.warning,
 #message div.confirmation,
-#remote-objects-message
+#message-objects div.notice,
+#message-objects div.error,
+#message-objects div.warning,
+#message-objects div.confirmation
 {
   background-image: url(images/display/icons.gif);
 }
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9bc46d08a..3ea4fec6c 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1197,21 +1197,20 @@ div.message-htmlpart div.rcmBody
   margin: 8px;
 }
 
-#remote-objects-message
+#message-objects div
 {
-  display: none;
   margin: 8px;
   min-height: 20px;
   padding: 10px 10px 6px 46px;
 }
 
-#remote-objects-message a
+#message-objects div a
 {
   color: #666666;
   padding-left: 10px;
 }
 
-#remote-objects-message a:hover
+#message-objects div a:hover
 {
   color: #333333;
 }
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>