diff --git a/mailarchive/mailarchive-james/james/src/java/org/sakaiproject/james/SakaiMailet.java b/mailarchive/mailarchive-james/james/src/java/org/sakaiproject/james/SakaiMailet.java
index 10718beb57f1..e85d04ca473e 100644
--- a/mailarchive/mailarchive-james/james/src/java/org/sakaiproject/james/SakaiMailet.java
+++ b/mailarchive/mailarchive-james/james/src/java/org/sakaiproject/james/SakaiMailet.java
@@ -505,7 +505,8 @@ public void service(Mail mail) throws MessagingException
 						M_log.warn("IOException: service(): msg.getContent() threw: " + e, e);
 					}
 					
-					mailHeaders.add("List-Id: <"+ channel.getId()+ ".localhost>");
+					mailHeaders.add("List-Id: <"+ channel.getId()+ "."+ serverConfigurationService.getServerName()+ ">");
+
 					// post the message to the group's channel
 					String body[] = new String[2];
 					body[0] = bodyBuf[0].toString(); // plain/text