2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 967e68a..b917c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
         Fixed Bugs
         ----------
                 * n.a.- scale O-Menu-Applets appropriately (mickeyl)
+                * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
+                * n.a.- always show volume and wireless applet popups inside visible screen (deller)
 
         2005-03-25Opie 1.2.0
 
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
@@ -50,8 +50,9 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
 
     // include location or not
-    if ( show_location ) {
-        msg += "<BR><i>" + (ev).location() + "</i>";
+    if ( show_location && !(ev).location().isEmpty() ) {
+        if ( (ev).location() != tr("(Unknown)") )
+               msg += "<BR><i>" + (ev).location() + "</i>";
     }
 
     QString timeSpacer = "   ";
@@ -59,13 +60,14 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
         timeSpacer = "<br>";
     }
 
+    msg += timeSpacer;
+
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
          &&  ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) {
         msg += tr ( "All day" );
     }  else {
         // start time of event
 //         QDate tempDate = (ev).event().start().date();
-        msg += timeSpacer;
         msg += ampmTime( QTime( (ev).event().start().time() ) )
                // end time of event
                + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) );