summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/app.js8
-rw-r--r--skins/default/images/icons/blank.gifbin0 -> 54 bytes
-rw-r--r--skins/default/templates/mail.html2
3 files changed, 3 insertions, 7 deletions
diff --git a/program/js/app.js b/program/js/app.js
index c46997afa..7e9509ec2 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1624,7 +1624,7 @@ function rcube_webmail()
if (rows[uid].flagged && this.env.flaggedicon)
icn_src = this.env.flaggedicon;
- else if (this.env.unflaggedicon)
+ else if (!rows[uid].flagged && this.env.unflaggedicon)
icn_src = this.env.unflaggedicon;
if (rows[uid].flagged_icon && icn_src)
@@ -3491,10 +3491,6 @@ function rcube_webmail()
}
else if (col == 'subject' && this.message_list)
this.message_list.subject_col = n+1;
- else if (col == 'flag' && this.env.unflaggedicon)
- {
- cell.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
- }
}
};
@@ -3556,7 +3552,7 @@ function rcube_webmail()
{
if (flags.flagged && this.env.flaggedicon)
col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
- else if(this.env.unflaggedicon)
+ else if(!flags.flagged && this.env.unflaggedicon)
col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
}
else if (c=='attachment')
diff --git a/skins/default/images/icons/blank.gif b/skins/default/images/icons/blank.gif
new file mode 100644
index 000000000..7dd464ea3
--- /dev/null
+++ b/skins/default/images/icons/blank.gif
Binary files differ
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index eed853a92..2ab24e202 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -56,7 +56,7 @@
forwardedrepliedIcon="/images/icons/forwarded_replied.png"
attachmentIcon="/images/icons/attachment.png"
flaggedIcon="/images/icons/flagged.png"
- unflaggedIcon="/images/blank.gif" />
+ unflaggedIcon="/images/icons/blank.gif" />
</div>
<roundcube:if condition="config:preview_pane == true" />