2 files changed, 6 insertions, 3 deletions

diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 72a7242..03dacae 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -6,20 +6,22 @@
 #include <qaction.h>
 #include <qtimer.h>
 #include <qlabel.h>
 #include <qapplication.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
+#include <opie/ofiledialog.h>
+//#include "attachdiag.h"
+
 #include "addresspicker.h"
 #include "listviewplus.h"
 #include "smtphandler.h"
-#include "attachdiag.h"
 #include "composer.h"
 #include "rename.h"
 
 AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
         : QListViewItem(parent), _attachment(attachment)
 {
         setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap());
         setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
@@ -389,17 +391,18 @@ void Composer::slotOpenAddressPicker()
                 } else {
                         bcc->setText(bcc->text() + ", " + AddressPicker::getNames());
                 }
         }
 }
 
 void Composer::slotAddAttach()
 {
-        DocLnk lnk = AttachDiag::getFile(this);
+  DocLnk lnk = OFileDialog::getOpenFileName( 1,"/");
+        //DocLnk lnk = AttachDiag::getFile(this);
         if (lnk.name().isEmpty()) return;
 
         Attachment attachment;
         attachment.setFileName(lnk.file());
         attachment.setNewName(lnk.name());
         attachment.setDocLnk(lnk);
         
         (void) new AttachViewItem(attachView, attachment);
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 76b7996..cd21d4a 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -36,11 +36,11 @@ SOURCES		= 	accounteditor.cpp \
                           viewmailbase.cpp
         INTERFACES      = accounteditorbase.ui \
                           addresspickerbase.ui \
                           configdiagbase.ui \
                           opendiagbase.ui \
                           renamebase.ui \
                           searchdiagbase.ui
         INCLUDEPATH    += $(OPIEDIR)/include libmail
-        LIBS           += -lmail -lqpe
+        LIBS           += -lmail -lqpe -lopie
         TARGET          = mail 
         DESTDIR                 = $(OPIEDIR)/bin