*** gotmail	Fri Mar 14 09:12:14 2003
--- gotmail.jp	Sat May 31 08:09:51 2003
***************
*** 37,42 ****
--- 37,44 ----
  use FileHandle;
  use strict;
  
+ use Jcode;
+ 
  # Signal handlers:
  $SIG{INT} = $SIG{__DIE__} =
  	sub {
***************
*** 232,238 ****
  		} elsif ($_ =~ /^forward(ing-email)?=(.+)$/i) {
  			$resend_address = $2;
  		} elsif ($_ =~ /^folders=(.+)$/i) {
! 			@conf_folders = split(/ *, */, $1);
  		} elsif ($_ =~ /^folder[_-]dir(ectory)?=(.+)$/i) {
  			$conf_folder_directory = $2;
  			if ($conf_folder_directory !~ /\/$/) {
--- 234,241 ----
  		} elsif ($_ =~ /^forward(ing-email)?=(.+)$/i) {
  			$resend_address = $2;
  		} elsif ($_ =~ /^folders=(.+)$/i) {
! 		        my $tmp = Jcode->new($1)->euc;
! 			@conf_folders = split(/ *, */, $tmp);
  		} elsif ($_ =~ /^folder[_-]dir(ectory)?=(.+)$/i) {
  			$conf_folder_directory = $2;
  			if ($conf_folder_directory !~ /\/$/) {
***************
*** 782,787 ****
--- 785,791 ----
  {
  	my($url, $add_mboxheader, $folder) = @_;
  	my(@output) = ();
+ 	$folder = Jcode->new($folder)->sjis;
  
  	dispText("Getting email message...\n");
  
***************
*** 850,855 ****
--- 854,860 ----
  	}
  
  	# Add some more special headers right before the message body.
+ 	my $folder = Jcode->new($folder)->jis;
  	my($gm_headers) = "X-gotmail-version: $gotmail_version\nX-gotmail-folder: $folder\nX-gotmail-user: $login\n";
  	s/^$/$gm_headers/m;
  
***************
*** 903,909 ****
  				if ($conf_save_to_login) {
  					$outfile .= $login;
  					if ($foldername ne "Inbox") {
! 						$outfile .= ("-" . $foldername);
  					}
  				} else {
  					$outfile .= $foldername;
--- 908,916 ----
  				if ($conf_save_to_login) {
  					$outfile .= $login;
  					if ($foldername ne "Inbox") {
! 					  if ($foldername ne "受信トレイ") {
! 					    $outfile .= ("-" . $foldername);
! 					  }
  					}
  				} else {
  					$outfile .= $foldername;
***************
*** 1008,1013 ****
--- 1015,1021 ----
  				if ( (!($name =~ /[<>]/)) && (!($name =~ /Trash Can/i)) &&
  				     (!($name =~ /Sent Messages/i)) && (!($name =~ /Drafts/i)) ) {
  					$" = "~";
+ 					$name = Jcode->new($name)->euc;
  					if (!@conf_folders || ("~@conf_folders~" =~ /~$name~/i)) {
  					  dispText ("Processing Folder: \"" . $name .
  						          "\", Total messages: " . $totalItems .