diff -ruN roundcubemail-cvs-20060413/program/lib/imap.inc /var/www/roundcubemail-cvs-20060413/program/lib/imap.inc
--- roundcubemail-cvs-20060413/program/lib/imap.inc	2006-03-27 21:06:30.000000000 +0200
+++ /var/www/roundcubemail-cvs-20060413/program/lib/imap.inc	2006-07-27 12:40:13.000000000 +0200
@@ -1212,7 +1212,7 @@
 
 	/* FETCH date,from,subject headers */
 	$key="fh".($c++);
-	$request=$key." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE)])\r\n";
+	$request=$key." FETCH $message_set (BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT REPLY-TO IN-REPLY-TO CC BCC CONTENT-TRANSFER-ENCODING CONTENT-TYPE MESSAGE-ID REFERENCE X-SPAM-FLAG)])\r\n";
 
 	if (!fputs($fp, $request)) return false;
 	do{
@@ -1261,6 +1261,7 @@
 			$result[$id]->from = $headers["from"];
 			$result[$id]->to = str_replace("\n", " ", $headers["to"]);
 			$result[$id]->subject = str_replace("\n", "", $headers["subject"]);
+			$result[$id]->junk = array_key_exists("x-spam-flag", $headers) ? true : false;
 			$result[$id]->replyto = str_replace("\n", " ", $headers["reply-to"]);
 			$result[$id]->cc = str_replace("\n", " ", $headers["cc"]);
 			$result[$id]->bcc = str_replace("\n", " ", $headers["bcc"]);
@@ -2079,4 +2080,4 @@
 	return (iil_C_Expunge($conn, $folder) >= 0);
 }
 
-?>
\ No newline at end of file
+?>
diff -ruN roundcubemail-cvs-20060413/program/steps/mail/func.inc /var/www/roundcubemail-cvs-20060413/program/steps/mail/func.inc
--- roundcubemail-cvs-20060413/program/steps/mail/func.inc	2006-04-06 19:35:04.000000000 +0200
+++ /var/www/roundcubemail-cvs-20060413/program/steps/mail/func.inc	2006-07-27 12:42:40.000000000 +0200
@@ -406,11 +406,12 @@
 	// set attachment icon
     if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype))
       $attach_icon = $attrib['attachmenticon'];
-        
-    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s %s">'."\n",
+
+    $out .= sprintf('<tr id="rcmrow%d" class="message%s%s%s %s">'."\n",
                     $header->uid,
                     $header->seen ? '' : ' unread',
                     $header->deleted ? ' deleted' : '',
+		    $header->junk ? ' junk' : '',
                     $zebra_class);    
     
     $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : '');
@@ -1470,4 +1471,4 @@
   }
   
   
-?>
\ No newline at end of file
+?>
diff -ruN roundcubemail-cvs-20060413/skins/default/mail.css /var/www/roundcubemail-cvs-20060413/skins/default/mail.css
--- roundcubemail-cvs-20060413/skins/default/mail.css	2006-04-04 23:41:22.000000000 +0200
+++ /var/www/roundcubemail-cvs-20060413/skins/default/mail.css	2006-07-27 12:47:01.000000000 +0200
@@ -439,6 +439,12 @@
   background-color: #FFFFFF;
 }
 
+#messagelist tr.junk
+{
+  /*font-style: oblique;*/
+  background-color: #e0ffcc;
+}
+
 #messagelist tr.selected td
 {
   font-weight: bold;