1 files changed, 8 insertions, 3 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 0c1ac7a..8f17e6e 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -664,28 +664,33 @@ void KOListView::saveDescriptionToFile()
                 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
             Incidence *incidence = delSel.first();
             icount = 0;
             while ( incidence ) {
                 if ( incidence->typeID()  == journalID ) {
                     text += "\n************************************\n";
-                    text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
+                    if ( !incidence->summary().isEmpty() )
+                        text += i18n("Journal: %1 from ").arg( incidence->summary() )  +incidence->dtStartDateStr( false );
+                    else
+                        text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
+                    if ( !incidence->location().isEmpty() )
+                        text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                     text +="\n" +  i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                     text +="\n" +  i18n("Description: ") + "\n"+ incidence->description();
                     ++icount;
 
                 } else {
                     if ( !incidence->description().isEmpty() ) {
                         text += "\n************************************\n";
                         if ( incidence->typeID()  == todoID )
                             text += i18n("To-Do: ");
                         text += incidence->summary();
+                        if ( !incidence->location().isEmpty() )
+                            text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                         if ( incidence->hasStartDate() )
                             text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false );
                         text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
-                        if ( !incidence->location().isEmpty() )
-                            text += "\n" +i18n("Location: ") + incidence->location();
                         text += "\n" + i18n("Description: ") + "\n" + incidence->description();
                         ++icount;
 
                     }
                 }
                 incidence = delSel.next();