1 files changed, 4 insertions, 2 deletions

diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index f5b0d0a..a540327 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -51,5 +51,6 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 
     // include location or not
-    if ( show_location ) {
+    if ( show_location && !(ev).location().isEmpty() ) {
+        if ( (ev).location() != tr("(Unknown)") )
         msg += "<BR><i>" + (ev).location() + "</i>";
     }
@@ -60,4 +61,6 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
 
+    msg += timeSpacer;
+
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
          &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) {
@@ -66,5 +69,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
         // start time of event
 //         QDate tempDate = (ev).event().start().date();
-        msg += timeSpacer;
         msg += ampmTime( QTime( (ev).event().start().time() ) )
                // end time of event