tags. Hope this is a temporary weakness in their mind.
+ # (Hope makes living, we say in Dutch ...)
+ # If we want to allow it set this to one. Currently as of 8/9/2007 it must be accepted or the
+@@ -275,7 +278,7 @@ sub ParseConfig {
+ } elsif ($Option =~ m/^Password$/i) {
+ $Password = $OptionValue;
+ } elsif ($Option =~ m/^Mode$/i) {
+- warn "\n'Mode = ...' in the config file is ignored.\nThis version works only for 'Live' mailboxes !\n";
++ $Mode = $OptionValue;
+ } elsif ($Option =~ m/^Domain$/i) {
+ $Domain = $OptionValue;
+ } elsif ($Option =~ m/^Proxy$/i) {
+@@ -298,6 +301,8 @@ sub ParseConfig {
+ $MarkRead = $OptionValue;
+ } elsif ($Option =~ m/^Delete$/i) {
+ $Delete = $OptionValue;
++ } elsif ($Option =~ m/^SkipTrash$/i) {
++ $SkipTrash = $OptionValue;
+ } elsif ($Option =~ m/^MoveToFolder$/i) {
+ $MoveToFolder = $OptionValue;
+ } else {
+@@ -332,6 +337,10 @@ sub ParseConfig {
+ Display("MarkRead should take No or Yes as argument in the configuration file.\n",stderr=>1);
+ DisplayUsageAndExit();
+ }
++ if ($SkipTrash !~ m/^(No|Yes)$/i) {
++ Display("SkipTrash should take No or Yes as argument in the configuration file.\n",stderr=>1);
++ DisplayUsageAndExit();
++ }
+ if ($Delete !~ m/^(No|Yes)$/i) {
+ Display("Delete should take No or Yes as argument in the configuration file.\n",stderr=>1);
+ DisplayUsageAndExit();
+@@ -340,6 +349,10 @@ sub ParseConfig {
+ Display("Delete must be 'No' when MoveToFolder is also specified in the configuration file.\n",stderr=>1);
+ DisplayUsageAndExit();
+ }
++ if ($Mode !~ m/^(200809|200810)$/i) {
++ Display("Mode must be oneof 200809 or 200810 as argument in the configuration file.\n",stderr=>1);
++ DisplayUsageAndExit();
++ }
+ }
+
+ ########################################################################################################################
+@@ -535,7 +548,7 @@ sub Login() {
+
+ Display("Getting hotmail index loginpage.\n", MinVerbosity =>2);
+
+- my ($LoginPageAsString,$GetPageUrl) = GetPage(Url => "http://mail.live.com",FollowForward => 1);
++ my ($LoginPageAsString,$GetPageUrl) = GetPage(Url => "http://mail.live.com/",FollowForward => 1);
+
+ # We expect here a number of functions now (aug 2007) to be hidden in a javascript
+ # that is loaded separately. Let's load and append.
+@@ -960,7 +973,7 @@ sub GetMessagesFromFolder($) {
+ "au=$AuthUser&".
+ "ptid=0";
+ my $PostData = "";
+- if ($Page == 1) {
++ if ($Mode =~ m/200809/ && $Page == 1) {
+ $PostData = "cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox".
+ "&".
+ "mn=GetInboxData".
+@@ -971,7 +984,7 @@ sub GetMessagesFromFolder($) {
+ "v=1".
+ "&".
+ "mt=$MT";
+- } else {
++ } elsif ($Mode =~ m/200809/) {
+ $PostData = "cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox".
+ "&".
+ "mn=GetInboxData".
+@@ -979,11 +992,37 @@ sub GetMessagesFromFolder($) {
+ "d=true,true,{".uri_escape("\"$FolderId\"").",25,NextPage,0,Date,false,".
+ uri_escape("\"$pnAm\"") . "," .
+ uri_escape("\"$pnAd\"") . "," .
+- "$Page,2,false,null,false,$ReportedNrMessages},false,null".
++ "$Page,2,false,null,false,$ReportedNrMessages},false,null".
+ "&".
+ "v=1".
+ "&".
+ "mt=$MT";
++ } elsif ($Mode =~ m/200810/ && $Page == 1) {
++ $PostData = "cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox".
++ "&".
++ "mn=GetInboxData".
++ "&".
++ "d=true,true,{".uri_escape("\"$FolderId\"").",0,0,Date,false,".
++ uri_escape("\"$pnAm\"") . "," .
++ uri_escape("\"$pnAd\"") . "," .
++ "$Page,2,false,%22%22,0,-1,Off},false,null".
++ "&".
++ "v=1".
++ "&".
++ "mt=$MT";
++ } elsif ($Mode =~ m/200810/) {
++ $PostData = "cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox".
++ "&".
++ "mn=GetInboxData".
++ "&".
++ "d=true,true,{".uri_escape("\"$FolderId\"").",NextPage,0,Date,false,".
++ uri_escape("\"$pnAm\"") . "," .
++ uri_escape("\"$pnAd\"") . "," .
++ "$Page,2,false,%22%22,$ReportedNrMessages,-1,Off},false,null".
++ "&".
++ "v=1".
++ "&".
++ "mt=$MT";
+ }
+
+ ($PageAsString,$GetPageUrl) = GetPage(Url => $Url,CurlDataArg => $PostData);
+@@ -1003,8 +1042,9 @@ sub GetMessagesFromFolder($) {
+
+ # get the ID for the trash folder
+ $TrashFolderId = $PageAsString;
+- $TrashFolderId =~ m/sysFldrs\s*?:\s*?{\s*?trashFid\s*?:\s*?\"(.*?)\".*?}/si;
++ $TrashFolderId =~ m/sysFldrs\s*?:\s*?{.*?trashFid\s*?:\s*?\"(.*?)\".*?}/si;
+ $TrashFolderId = $1;
++ die "Could not find TrashFolderId." unless $TrashFolderId;
+
+ # get the session variables as well as the request handler
+ $PageAsString =~ m/fppCfg\s*?:\s*?{\s*?RequestHandler\s*?:\s*?\"(.*?)\".*?SessionId\s*?:\s*?\"(.*?)\".*?AuthUser\s*?:\s*?\"(.*?)\".*?}/si;
+@@ -1016,9 +1056,12 @@ sub GetMessagesFromFolder($) {
+
+ # To start with we limit us to a MessagesArea between
+ #