1 files changed, 5 insertions, 4 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 92d2a80..c0acf34 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -181,3 +181,3 @@ void KOEventViewer::setSource(const QString& n)
         } else {
-       ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
+          ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
        //QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
@@ -357,3 +357,3 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
-        mMailSubject += i18n(" at ") + event->location();
+        mMailSubject += " (" + i18n("Location: ") + event->location() + ")";
     }
@@ -516,5 +516,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }
+    if (!event->location().isEmpty()) { 
+        mMailSubject += " (" + i18n("Location: ") + event->location() + ")";
+    }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
-        mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
@@ -522,3 +524,2 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
-        mMailSubject += i18n(" at ") + event->location();
     }