diff --git announcement-impl/impl/src/bundle/siteemaanc.properties announcement-impl/impl/src/bundle/siteemaanc.properties
index f5544dd..fcaa7a2 100644
--- announcement-impl/impl/src/bundle/siteemaanc.properties
+++ announcement-impl/impl/src/bundle/siteemaanc.properties
@@ -2,8 +2,8 @@ Announcement = Announcement
 
 Attachments = Attachments:
 
-noti.header.add= An announcement has been added in the "{0}" site at {1} (<a href="{2}/site/{3}">{2}/site/{3}</a>)
-noti.header.update= An announcement has been updated in the "{0}" site at {1} (<a href="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add= An announcement has been added in the "{0}" site at {1} (<a href="{2}">{2}</a>)
+noti.header.update= An announcement has been updated in the "{0}" site at {1} (<a href="{2}">{2}</a>)
 noti.subj= [ {0} -  Announcement ] {1}
 noti.tag.html= <hr/><br/>This automatic notification message was sent by {0} (<a href="{1}">{1}</a>) from the {2} site.<br/> You can modify how you receive notifications at My Workspace > Preferences.<br/>
 noti.tag= ---------------------- \n This automatic notification message was sent by {0} ({1}) from the {2} site.\n You can modify how you receive notifications at My Workspace > Preferences.\n
diff --git announcement-impl/impl/src/bundle/siteemaanc_ca.properties announcement-impl/impl/src/bundle/siteemaanc_ca.properties
index a4aaafe..7a3bcdc 100644
--- announcement-impl/impl/src/bundle/siteemaanc_ca.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_ca.properties
@@ -10,9 +10,9 @@ syllabus_existed_item_changed=L'\u00EDtem existent s'ha modificat
 Date=Data
 Group=Grup\: 
 Message=Missatge
-noti.header.add=S'ha afegit un av\u00EDs al lloc "{0}" a {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add=S'ha afegit un av\u00EDs al lloc "{0}" a {1} (<a href\="{2}">{2}</a>)
 Attachments=fitxers adjunts\:
 noti.tag=----------------------  Aquest missatge autom\u00E0tic de notificaci\u00F3 l'ha enviat {0} ({1}) des del lloc {2} . Pot modificar la manera en la qual rep les notificacions des d'El meu espai de treball > Prefer\u00E8ncies.
 syllabus_posted_deleted=S'ha esborrat l'\u00EDtem enviat
-noti.header.update=S'ha actualitzat un av\u00EDs al lloc "{0}" a {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=S'ha actualitzat un av\u00EDs al lloc "{0}" a {1} (<a href\="{2}">{2}</a>)
 syllabus_new_posted_item=L'\u00EDtem nou s'ha enviat
diff --git announcement-impl/impl/src/bundle/siteemaanc_es.properties announcement-impl/impl/src/bundle/siteemaanc_es.properties
index a6b3887..841586c 100644
--- announcement-impl/impl/src/bundle/siteemaanc_es.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_es.properties
@@ -10,9 +10,9 @@ Date=Fecha
 syllabus_existed_item_changed=\u00CDtem existente modificado
 Group=Grupo
 Message=Mensaje
-noti.header.add=Se ha a\u00F1adido un anuncio en el sitio "{0}" en {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add=Se ha a\u00F1adido un anuncio en el sitio "{0}" en {1} (<a href\="{2}">{2}</a>)
 Attachments=Adjuntos\:
 syllabus_posted_deleted=Se ha eliminado un \u00EDtem definitivo
 noti.tag=----------------------  Este mensaje de notificaci\u00F3n autom\u00E1tica fue enviado por {0} ({1}) desde el sitio {2} . Puede modificar el modo en que recibe las notificaciones desde Mi Sitio > Preferencias.
 syllabus_new_posted_item=Nuevo \u00EDtem definitivo
-noti.header.update=Se ha actualizado un anuncio en el sitio "{0}" en {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=Se ha actualizado un anuncio en el sitio "{0}" en {1} (<a href\="{2}">{2}</a>)
diff --git announcement-impl/impl/src/bundle/siteemaanc_fr_FR.properties announcement-impl/impl/src/bundle/siteemaanc_fr_FR.properties
index 38b299a..58769db 100755
--- announcement-impl/impl/src/bundle/siteemaanc_fr_FR.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_fr_FR.properties
@@ -10,9 +10,9 @@ syllabus_existed_item_changed=El\u00E9ment existant modifi\u00E9
 Date=Date \:
 Group=Groupe \:
 Message=Message \:
-noti.header.add=Une annonce a \u00E9t\u00E9 ajout\u00E9e dans le site "{0}" (<a href\="{2}/site/{3}">{2}/site/{3}</a>)\n
+noti.header.add=Une annonce a \u00E9t\u00E9 ajout\u00E9e dans le site "{0}" (<a href\="{2}">{2}</a>)\n
 Attachments=Fichiers joints \:
 syllabus_posted_deleted=El\u00E9ment publi\u00E9 supprim\u00E9
 noti.tag=---------------------- \nCe message de notification automatique a \u00E9t\u00E9 envoy\u00E9 par {0} ({1})  du site  {2}.\nVous pouvez modifier la fa\u00E7on de recevoir les notifications aller dans l'onglet Mon Espace de travail  puis cliquez sur Outil des pr\u00E9f\u00E9rences puis sur notification.\n
 syllabus_new_posted_item=Nouvel \u00E9l\u00E9ment publi\u00E9
-noti.header.update=Une annonce a \u00E9t\u00E9 mise \u00E0 jour dans le site "{0}" (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=Une annonce a \u00E9t\u00E9 mise \u00E0 jour dans le site "{0}" (<a href\="{2}">{2}</a>)
diff --git announcement-impl/impl/src/bundle/siteemaanc_ja.properties announcement-impl/impl/src/bundle/siteemaanc_ja.properties
index 4247d18..53be1dd 100644
--- announcement-impl/impl/src/bundle/siteemaanc_ja.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_ja.properties
@@ -10,9 +10,9 @@ syllabus_existed_item_changed=\u65E2\u5B58\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u
 Date=\u65E5\u6642
 Group=\u30B0\u30EB\u30FC\u30D7\: 
 Message=\u30E1\u30C3\u30BB\u30FC\u30B8
-noti.header.add=\u30A2\u30CA\u30A6\u30F3\u30B9\u304C\u300C{1}\u300D\u306E\u300C{0}\u300D\u30B5\u30A4\u30C8\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add=\u30A2\u30CA\u30A6\u30F3\u30B9\u304C\u300C{1}\u300D\u306E\u300C{0}\u300D\u30B5\u30A4\u30C8\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F (<a href\="{2}">{2}</a>)
 Attachments=\u6DFB\u4ED8\u30D5\u30A1\u30A4\u30EB\:
 syllabus_posted_deleted=\u6295\u7A3F\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u524A\u9664\u3055\u308C\u307E\u3057\u305F
 noti.tag=---------------------- \n \u3053\u306E\u81EA\u52D5\u901A\u77E5\u30E1\u30C3\u30BB\u30FC\u30B8\u306F\u300C{2}\u300D\u30B5\u30A4\u30C8\u304B\u3089\u300C{0} (<a href\="{1}">{1}</a>)\u300D\u306B\u3088\u3063\u3066\u9001\u4FE1\u3055\u308C\u307E\u3057\u305F\uFF0E\n \u901A\u77E5\u8A2D\u5B9A\u306E\u4FEE\u6B63\u306F\u300C\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u2192\u8A2D\u5B9A\u300D\u3067\u884C\u3044\u307E\u3059\uFF0E\n
 syllabus_new_posted_item=\u65B0\u3057\u304F\u6295\u7A3F\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0
-noti.header.update=\u30A2\u30CA\u30A6\u30F3\u30B9\u304C\u300C{1}\u300D\u306E\u300C{0}\u300D\u30B5\u30A4\u30C8\u3067\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=\u30A2\u30CA\u30A6\u30F3\u30B9\u304C\u300C{1}\u300D\u306E\u300C{0}\u300D\u30B5\u30A4\u30C8\u3067\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F (<a href\="{2}">{2}</a>)
diff --git announcement-impl/impl/src/bundle/siteemaanc_nl.properties announcement-impl/impl/src/bundle/siteemaanc_nl.properties
index f3a9f2b..e672ee3 100644
--- announcement-impl/impl/src/bundle/siteemaanc_nl.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_nl.properties
@@ -19,8 +19,8 @@ Public = Openbaar
 
 Subject = Onderwerp:
 
-noti.header.add    = Er is een mededeling toegevoegd in de werkruimte "{0}" op {1}  (<a href="{2}/site/{3}">{2}/site/{3}</a>)
-noti.header.update = Er is een mededeling bijgewerkt in de werkruimte "{0}" op {1}  (<a href="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add    = Er is een mededeling toegevoegd in de werkruimte "{0}" op {1}  (<a href="{2}">{2}</a>)
+noti.header.update = Er is een mededeling bijgewerkt in de werkruimte "{0}" op {1}  (<a href="{2}">{2}</a>)
 noti.subj          = [ {0} -  Mededeling ] {1}
 noti.tag           = ----------------------\nDeze automatisch notificatie is verzonden door {0} ({1}) vanuit de werkruimte {2}.\nU kunt uw notificatievoorkeuren aanpassen via Mijn Werkruimte > Voorkeuren. 
 noti.tag.html      = <hr/><br/>Deze automatisch notificatie is verzonden door {0}  (<a href="{1}">{1}</a>) vanuit de werkruimte {2}.<br/>U kunt uw notificatievoorkeuren aanpassen via Mijn Werkruimte > Voorkeuren. <br/>
diff --git announcement-impl/impl/src/bundle/siteemaanc_pt_PT.properties announcement-impl/impl/src/bundle/siteemaanc_pt_PT.properties
index 49275b9..4fcdc7a 100755
--- announcement-impl/impl/src/bundle/siteemaanc_pt_PT.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_pt_PT.properties
@@ -10,9 +10,9 @@ Date=Data\:
 syllabus_existed_item_changed=Item foi mudado
 Group=Grupo\: 
 Message=Mensagem\: 
-noti.header.add=Este an\u00FAncio foi criado na \u00E1rea "{0}" em {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add=Este an\u00FAncio foi criado na \u00E1rea "{0}" em {1} (<a href\="{2}">{2}</a>)
 Attachments=Anexos\: 
 syllabus_posted_deleted=Item removido
 noti.tag=---------------------- Esta notifica\u00E7\u00E3o autom\u00E1tica foi enviada por {0} ({1}) para a \u00E1rea "{2}". Para modificar as suas prefer\u00EAncias sobre Notifica\u00E7\u00F5es, dirija-se a "\u00C1rea Pessoal -> Prefer\u00EAncias".
 syllabus_new_posted_item=Novo item
-noti.header.update=Este an\u00FAncio foi actualizado na \u00E1rea "{0}" em {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=Este an\u00FAncio foi actualizado na \u00E1rea "{0}" em {1} (<a href\="{2}">{2}</a>)
diff --git announcement-impl/impl/src/bundle/siteemaanc_ru.properties announcement-impl/impl/src/bundle/siteemaanc_ru.properties
index 1499421..ddfcdac 100644
--- announcement-impl/impl/src/bundle/siteemaanc_ru.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_ru.properties
@@ -10,9 +10,9 @@ Date=\u0414\u0430\u0442\u0430 \u0438 \u0432\u0440\u0435\u043C\u044F
 syllabus_existed_item_changed=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u043D\u044B\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442
 Group=\u0413\u0440\u0443\u043F\u043F\u0430\:
 Message=\u0421\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435
-noti.header.add=\u041D\u043E\u0432\u043E\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 {0}\u00BB \u0432 {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.add=\u041D\u043E\u0432\u043E\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 {0}\u00BB \u0432 {1} (<a href\="{2}">{2}</a>)
 Attachments=\u041F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\:
 syllabus_posted_deleted=\u0423\u0434\u0430\u043B\u0435\u043D\u043D\u044B\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442
 noti.tag=\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014 \u042D\u0442\u043E \u043F\u0438\u0441\u044C\u043C\u043E \u043F\u0438\u0441\u044C\u043C\u043E \u2014 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0435, \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u043E\u0435 \u0441 {0} ({1}) \u0441 \u0441\u0430\u0439\u0442\u0430 {2}. \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0439 \u0432 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u043B\u044C\u043D\u043E\u043C \u043A\u0430\u0431\u0438\u043D\u0435\u0442\u0435\: \u041C\u043E\u0439 \u0441\u0430\u0439\u0442 \u2192 \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438.
 syllabus_new_posted_item=\u041D\u043E\u0432\u044B\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442
-noti.header.update=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 \u00AB{0}\u00BB \u0432 {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>)
+noti.header.update=\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u0430 \u0441\u0430\u0439\u0442\u0435 \u00AB{0}\u00BB \u0432 {1} (<a href\="{2}">{2}</a>)
diff --git announcement-impl/impl/src/bundle/siteemaanc_vi.properties announcement-impl/impl/src/bundle/siteemaanc_vi.properties
index bf2e117..7f5ba4b 100644
--- announcement-impl/impl/src/bundle/siteemaanc_vi.properties
+++ announcement-impl/impl/src/bundle/siteemaanc_vi.properties
@@ -5,14 +5,14 @@
 #Tue Sep 07 15:05:28 PDT 2010
 Announcement=Th\u00F4ng b\u00E1o 
 Subject=Ti\u00EAu \u0111\u1EC1\: 
-noti.header.update=Th\u00F4ng b\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt trong "{0}" trang web t\u1EA1i {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>) 
+noti.header.update=Th\u00F4ng b\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt trong "{0}" trang web t\u1EA1i {1} (<a href\="{2}">{2}</a>) 
 syllabus_new_posted_item=Item M\u1EDBi \u0111\u01B0\u1EE3c \u0111\u0103ng m\u1EE5c 
 Message=Th\u00F4ng b\u00E1o\: 
 Group=Nh\u00F3m\: 
 From=T\u1EEB\: 
 Attachments=\u0110\u00EDnh k\u00E8m\: 
 noti.tag.html=<hr/><br/> Th\u00F4ng \u0111i\u1EC7p n\u00E0y th\u00F4ng b\u00E1o s\u1EBD \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ( <a href\="{1}">{1}</a> ) t\u1EEB {2} trang web. <br/> B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences. <br/>
-noti.header.add=Th\u00F4ng b\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt trong "{0}" trang web t\u1EA1i {1} (<a href\="{2}/site/{3}">{2}/site/{3}</a>) 
+noti.header.add=Th\u00F4ng b\u00E1o \u0111\u00E3 \u0111\u01B0\u1EE3c c\u1EADp nh\u1EADt trong "{0}" trang web t\u1EA1i {1} (<a href\="{2}">{2}</a>) 
 Allgroups=Trang web 
 Public=C\u00F4ng khai 
 noti.tag=---------------------- T\u1EF1 \u0111\u1ED9ng th\u00F4ng b\u00E1o tin nh\u1EAFn n\u00E0y  \u0111\u00E3 \u0111\u01B0\u1EE3c g\u1EEDi b\u1EDFi {0} ({1}) t\u1EEB {2} trang web. \n B\u1EA1n c\u00F3 th\u1EC3 thay \u0111\u1ED5i c\u00E1ch b\u1EA1n nh\u1EADn \u0111\u01B0\u1EE3c th\u00F4ng b\u00E1o t\u1EA1i My Workspace > Preferences.\n 
diff --git announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
index e22431c..91c8710 100644
--- announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
+++ announcement-impl/impl/src/java/org/sakaiproject/announcement/impl/SiteEmailNotificationAnnc.java
@@ -152,31 +152,32 @@ public class SiteEmailNotificationAnnc extends SiteEmailNotification
 		Reference ref = EntityManager.newReference(event.getResource());
 		AnnouncementMessage msg = (AnnouncementMessage) ref.getEntity();
 		AnnouncementMessageHeader hdr = (AnnouncementMessageHeader) msg.getAnnouncementHeader();
-				
+
 		// use either the configured site, or if not configured, the site (context) of the resource
 		String siteId = (getSite() != null) ? getSite() : ref.getContext();
 
 		// get a site title
 		String title = siteId;
+		String url = ServerConfigurationService.getPortalUrl()+ "/site/"+ siteId;
 		try
 		{
 			Site site = SiteService.getSite(siteId);
 			title = site.getTitle();
+			url = site.getUrl(); // Might have a better URL.
 		}
 		catch (Exception ignore)
 		{
+			M_log.warn("Failed to load site: "+ siteId+ " for: "+ event.getResource());
 		}
 
 		// Now build up the message text.
 		if (AnnouncementService.SECURE_ANNC_ADD.equals(event.getEvent()))
 		{
-			buf.append(rb.getFormattedMessage("noti.header.add", new Object[]{title,ServerConfigurationService.getString("ui.service", "Sakai"),ServerConfigurationService.getPortalUrl(), siteId}));
-
+			buf.append(rb.getFormattedMessage("noti.header.add", new Object[]{title,ServerConfigurationService.getString("ui.service", "Sakai"), url}));
 		}
 		else
 		{
-			buf.append(rb.getFormattedMessage("noti.header.update", new Object[]{title,ServerConfigurationService.getString("ui.service", "Sakai"),ServerConfigurationService.getPortalUrl(), siteId}));
-
+			buf.append(rb.getFormattedMessage("noti.header.update", new Object[]{title,ServerConfigurationService.getString("ui.service", "Sakai"), url}));
 		}
 		buf.append(newline);
 		buf.append(newline);
@@ -459,7 +460,7 @@ public class SiteEmailNotificationAnnc extends SiteEmailNotification
 			}
 		});
 	}
-	
+
 	/**
 	 * remove recent add SecurityAdvisor from stack
 	 */