3 files changed, 14 insertions, 10 deletions

diff --git a/config.in b/config.in
index 6adf17e..742b8e3 100644
--- a/config.in
+++ b/config.in
@@ -150,33 +150,32 @@ menu "Base"
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in
   source noncore/apps/config.in
 endmenu
 
 menu "Communications and Networking"
   source noncore/comm/config.in
-  source noncore/mail/config.in
   source noncore/net/config.in
 endmenu
 
 menu "Games"
   source noncore/games/config.in
 endmenu
 
 menu "Graphics and Multimedia"
   source freetype/config.in
   source noncore/graphics/config.in
   source core/multimedia/config.in
   source noncore/multimedia/config.in
 endmenu
 
 menu "Input methods"
   source inputmethods/config.in
@@ -203,37 +202,47 @@ endmenu
 menu "Tools"
   source noncore/tools/config.in
 endmenu
 
 menu "Development"
   source development/keyview/config.in
   #source development/debugviewer/config.in
 endmenu
 
 menu "Examples"
     config EXAMPLES
         boolean "Compile Example Application"
     source examples/config.in
 endmenu
 
 comment ""
+
+menu "Unsupported / Unmaintained"
+  source noncore/unsupported/mail2/config.in
+  source noncore/unsupported/filebrowser/config.in
+  source noncore/unsupported/oipkg/config.in
+  source noncore/unsupported/qpdf/config.in
+  source noncore/unsupported/gsmtool/config.in
+endmenu
+
+comment ""
   depends on EXPERIMENTAL
 menu "Experimental"
   depends on EXPERIMENTAL
   source libopie2/config.in
 
   config SQL_PIM_BACKEND
   bool "Add SQL-Backend support (experimental)"
   default n
   help
         This adds the SQL-Support, using SQLite. Which database is used
         by the backends is defined by the file "pimaccess.conf" in the
-        directory "Settings". 
+        directory "Settings".
         There currently do exist to groups "[contact]" and "[todo]". You can
         select the used backend by the variable "usebackend=<type>", where
         <type> is "sql" or "xml". "xml" is the default !
         Important: The SQLite-library "libsqlite.so" must be installed !
   depends ( LIBOPIE2DB )
 
   comment "SQL-Support needs libopie2db!"
   depends !( LIBOPIE2DB )
 endmenu
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index c9896cb..6f279b0 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,12 +1,7 @@
-  config MAIL
-    boolean "EMail support"
-    default "y" if OPIEMAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
-
  config OPIEMAIL2
     boolean "opie-mail2 (an IMAP mail client)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL && MAIL
 
-  source noncore/mail/bend/config.in
-  source noncore/mail/libmail/config.in
+  source noncore/unsupported/mail2/bend/config.in
+  source noncore/unsupported/mail2/libmail/config.in
diff --git a/packages b/packages
index 3f3e20f..8c9f3cb 100644
--- a/packages
+++ b/packages
@@ -1,25 +1,25 @@
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
-        CONFIG_BEND     noncore/mail/bendbend.pro
+        CONFIG_BEND     noncore/unsupported/mail2/bendbend.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro