1 files changed, 15 insertions, 2 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 9f12152..3079141 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -414,3 +414,9 @@ void ExternalAppHandler::loadConfig()
   QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
+  QString qtpath = QString::fromLatin1( getenv("QTDIR") );
 
+  //if qtopiapath is not set, fallback to qt
+  if (qtopiapath.isEmpty())
+    qtopiapath = qtpath;
+
+  //if opiepath is not set, fallback to qtopia
   if (opiepath.isEmpty())
@@ -418,2 +424,4 @@ void ExternalAppHandler::loadConfig()
 
+
+
   //mailclients
@@ -428,6 +436,8 @@ void ExternalAppHandler::loadConfig()
   if (( QFile::exists( qtopiapath + "/bin/ompi" )) ||
-     ( QFile::exists( opiepath + "/bin/ompi" )))
+     ( QFile::exists( opiepath + "/bin/ompi" )) ||
+     ( QFile::exists( qtpath + "/bin/ompi" )))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC,   "OM/Pi email client",   "QPE/Application/ompi",    mailmsg1, "%1;%2",        mailmsg2,   "TO=%1;ATTACHMENT=%2");
 
-  if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
+  if (( QFile::exists( qtopiapath + "/bin/qtmail" )) ||
+      ( QFile::exists( qtpath + "/bin/qtmail" )))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail",   mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
@@ -437,2 +447,5 @@ void ExternalAppHandler::loadConfig()
 
+  if ( QFile::exists( opiepath + "/bin/mailit" ))
+    addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_MAILIT_EMC,   "Opie mailit email client",   "QPE/Application/mailit", mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
+