diff --git a/ChangeLog b/ChangeLog
index d00170021..2f243d9a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+        * We no longer show the previous/new location
+	if it's empty in the invitation update templates.
+
 2008-11-26  Ludovic Marcotte  <lmarcotte@inverse.ca>	
 
 	* SoObjects/SOGo/SOGoGCSFolder.m
diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html
index 3fc7b5dd1..07e0563a4 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html
@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
-This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
+This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Please make a decision for these new settings.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod
index 8f13b01aa..7d91b228a 100644
--- a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod
@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html
index 3fc7b5dd1..07e0563a4 100644
--- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.html
@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
-This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
+This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Please make a decision for these new settings.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod
index d1eed40a4..7d91b228a 100644
--- a/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailEnglishUpdate.wo/SOGoAptMailEnglishUpdate.wod
@@ -50,3 +50,11 @@ Summary: WOString {
   value = summary;
   escapeHTML = NO;
 }
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
+}
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html
index 3e601a5e8..1b9168190 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.html
@@ -1,5 +1,5 @@
 <#IsSubject>Le rendez-vous "<#Summary />" du <#OldAptStartDate /> à <#OldAptStartTime /> est modifié</#IsSubject>
 <#IsBody>
-La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /> (<#OldAptLocation />) est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /> (<#NewAptLocation />).
+La réunion qui devait se dérouler le <#OldAptStartDate /> à <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> est maintenant prévue le <#NewAptStartDate /> à <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Vous êtes invité à accepter ou refuser de participer à la réunion pour cette nouvelle date.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod
index 8f13b01aa..7d91b228a 100644
--- a/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailFrenchUpdate.wo/SOGoAptMailFrenchUpdate.wod
@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
index 3fc7b5dd1..07e0563a4 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
-This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
+This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Please make a decision for these new settings.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod
index 8f13b01aa..7d91b228a 100644
--- a/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.wod
@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html
index 9f0635140..c6dc9a58c 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.html
@@ -1,8 +1,5 @@
 <#IsSubject>L'appuntamento "<#Summary />" fissato in data <#OldAptStartDate /> alle ore <#OldAptStartTime /> &egrave; stato modificato </#IsSubject>
 <#IsBody>
-Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /> (<#OldAptLocation />)
-alle ore <#OldAptStartTime /> &egrave; ora programmato il <#NewAptStartDate
-/> alle ore <#NewAptStartTime
-/> (<#NewAptLocation />)
+Questo appuntamento, fissato precedentemete in data <#OldAptStartDate /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> alle ore <#OldAptStartTime /> &egrave; ora programmato il <#NewAptStartDate /> alle ore <#NewAptStartTime/><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Per confermare o disdire.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod
index 8f13b01aa..d5a659fa6 100644
--- a/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailItalianUpdate.wo/SOGoAptMailItalianUpdate.wod
@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
-}
\ No newline at end of file
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 845011ba3..7f1615beb 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -96,6 +96,16 @@ static NSTimeZone *UTC = nil;
   ASSIGN(previousApt, theApt);
 }
 
+- (BOOL) hasNewLocation
+{
+  return ([[apt location] length] > 0);
+}
+
+- (BOOL) hasOldLocation
+{
+  return ([[previousApt location] length] > 0);
+}
+
 - (NSTimeZone *) viewTZ 
 {
   if (self->viewTZ) return self->viewTZ;
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html
index 3fc7b5dd1..07e0563a4 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html
+++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html
@@ -1,5 +1,5 @@
 <#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
 <#IsBody>
-This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /> (<#OldAptLocation />) is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /> (<#NewAptLocation />).
+This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
 Please make a decision for these new settings.
 </#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod
index 8f13b01aa..7d91b228a 100644
--- a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod
+++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod
@@ -49,4 +49,12 @@ IsBody: WOConditional {
 Summary: WOString {
   value = summary;
   escapeHTML = NO;
+}
+
+HasNewLocation: WOConditional {
+  condition = hasNewLocation;
+}
+
+HasOldLocation: WOConditional {
+  condition = hasOldLocation;
 }
\ No newline at end of file