diff --git a/etemplate/js/et2_widget_taglist.js b/etemplate/js/et2_widget_taglist.js
index aa434eee06..c1a385375e 100644
--- a/etemplate/js/et2_widget_taglist.js
+++ b/etemplate/js/et2_widget_taglist.js
@@ -112,7 +112,7 @@ var et2_taglist = et2_selectbox.extend(
 		this._super.apply(this, arguments);
 
 		// jQuery wrapped DOM node
-		this.div = jQuery("<div></div>");
+		this.div = jQuery("<div></div>").addClass('et2_taglist');
 
 		// magicSuggest object
 		this.taglist = null;
@@ -365,7 +365,7 @@ var et2_taglist_email = et2_taglist.extend(
 			this.options.autocomplete_params.include_lists = true;
 		}
 	},
-	
+
 	// PREG for validation comes from et2_url
 	//EMAIL_PREG: new RegExp(/^[^\x00-\x20()<>@,;:\".\[\]]+@([a-z0-9ÄÖÜäöüß](|[a-z0-9ÄÖÜäöüß_-]*[a-z0-9ÄÖÜäöüß])\.)+[a-z]{2,6}/),
 
@@ -375,6 +375,7 @@ var et2_taglist_email = et2_taglist.extend(
 		var valid = item.id != item.label || et2_url.prototype.EMAIL_PREG.test(item.id || '');
 
 		var label = jQuery('<span>').text(item.label);
+		if (item.class) label.addClass(item.class);
 		if (typeof item.title != 'undefined') label.attr('title', item.title);
 		if (!valid) label.addClass('ui-state-error');
 
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 5c3d8f261f..5336a3a722 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -645,6 +645,14 @@ ul.et2_link_string {
   margin: 0px;
   padding: 0px;
 }
+.et2_taglist .mailinglist {
+  width: 100%;
+  background-image: url(images/email.png);
+  padding-right: 20px;
+  background-position: right;
+  background-repeat: no-repeat;
+  font-weight: bold;
+}
 /**
  * VFS widget(s)
  */
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index fa5e601f3d..f135410e36 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -244,7 +244,7 @@ class mail_compose
 		if (isset($_GET['reply_id'])) $replyID = $_GET['reply_id'];
 		if (!$replyID && isset($_GET['id'])) $replyID = $_GET['id'];
 		if (isset($_GET['part_id'])) $partID = $_GET['part_id'];
-		
+
 		// Process different places we can use as a start for composing an email
 		if($_GET['from'] && $replyID)
 		{
@@ -1242,7 +1242,7 @@ class mail_compose
 
 		$etpl->exec('mail.mail_compose.compose',$content,$sel_options,$readonlys,$preserv,2);
 	}
-	
+
 	/**
 	 * Get pre-fill a new compose based on an existing email
 	 *
@@ -1284,14 +1284,14 @@ class mail_compose
 				case 'composeasnew':
 				case 'composefromdraft':
 					$content = $this->getDraftData($icServer, $folder, $msgUID, $part_id);
-					
+
 					$_focusElement = 'body';
 					$suppressSigOnTop = true;
 					break;
 				case 'reply':
 				case 'reply_all':
 					$content = $this->getReplyData($from == 'reply' ? 'single' : 'all', $icServer, $folder, $msgUID, $part_id);
-					
+
 					$_focusElement = 'body';
 					$suppressSigOnTop = false;
 					$isReply = true;
@@ -1952,7 +1952,7 @@ class mail_compose
 				}
 			}
 		}
-		
+
 		foreach((array)$_formData['to'] as $address) {
 			$address_array	= imap_rfc822_parse_adrlist((get_magic_quotes_gpc()?stripslashes($address):$address), '');
 			foreach((array)$address_array as $addressObject) {
@@ -2708,7 +2708,9 @@ class mail_compose
 				$results[] = array(
 					'id'	=> $key,
 					'name'	=> $list_name,
-					'label'	=> $list_name
+					'label'	=> $list_name,
+					'class' => 'mailinglist',
+					'title' => lang('Mailinglist'),
 				);
 				if($list_count++ > 5) break;
 			}