Synch up with main trunk and so on.
[elisp/wanderlust.git] / doc / wl-ja.texi
index 884e932..a1d391e 100644 (file)
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage ja
 @documentencoding iso-2022-jp
-@set VERSION 2.3.0
+@set VERSION 2.5.7
 @synindex pg cp
 @finalout
 
 This file documents Wanderlust,
 Yet another message interface on Emacsen.
 
-\e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$GF0$/%a!<%k\e(B/\e$B%K%e!<%94IM}%7%9%F%`\e(B
-Wanderlust \e$B$K4X$9$k@bL@=q$G$9!#\e(B
+\e$B$3$N%U%!%$%k$O\e(B Emacs \e$B$GF0$/%a!<%k\e(B/\e$B%K%e!<%94IM}%7%9%F%`\e(B Wanderlust \e$B$K4X$9\e(B
+\e$B$k@bL@=q$G$9!#\e(B
 
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi},
+Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
 @w{Fujikazu Okunishi}, @w{Masahiro Murata},
 @w{Kenichi Okada} and @w{Kaoru Takahashi}.
 
@@ -34,8 +34,8 @@ Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 are preserved on all copies.
 
-\e$BCx:n8"I=<($H$3$N5v2DJ8$,$9$Y$F$NJ#@=$KB8:_$9$k8B$j!"\e(B
-\e$B$3$N@bL@=q$N$^$C$?$/F10l$NJ#@=$r:n$j!"G[I[$9$k$3$H$r5v2D$9$k!#\e(B
+\e$BCx:n8"I=<($H$3$N5v2DJ8$,$9$Y$F$NJ#@=$KB8:_$9$k8B$j!"$3$N@bL@=q$N$^$C$?$/\e(B
+\e$BF10l$NJ#@=$r:n$j!"G[I[$9$k$3$H$r5v2D$9$k!#\e(B
 
 @ignore
 Permission is granted to process this file through TeX and print the
@@ -60,8 +60,8 @@ notice identical to this one.
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
 
-\e$B>e5-$N=$@5HG$K4X$9$k>r7o$N2<$G!"$3$N@bL@=q$NK]Lu$NJ#@=$r:n$j!"\e(B
-\e$BG[I[$9$k$3$H$r5v2D$9$k!#\e(B
+\e$B>e5-$N=$@5HG$K4X$9$k>r7o$N2<$G!"$3$N@bL@=q$NK]Lu$NJ#@=$r:n$j!"G[I[$9$k$3\e(B
+\e$B$H$r5v2D$9$k!#\e(B
 @end ifinfo
 
 @titlepage
@@ -69,17 +69,17 @@ into another language, under the above conditions for modified versions.
 @title Wanderlust \e$B%f!<%6%^%K%e%"%k\e(B
 @subtitle Yet another message interface on Emacsen
 @subtitle for Wanderlust version @value{VERSION}
-@author Yuuichi Teranishi \e$B;{@>M50l\e(B
-@author Fujikazu Okunishi \e$B1|@>F#OB\e(B
-@author Masahiro Murata   \e$BB<EDA442\e(B
-@author Kenichi Okada     \e$B2,ED7r0l\e(B
-@author Kaoru Takahashi   \e$B9b66\e(B  \e$B0j\e(B
+@author \e$B;{@>M50l\e(B
+@author \e$B1|@>F#OB\e(B
+@author \e$BB<EDA442\e(B
+@author \e$B2,ED7r0l\e(B
+@author \e$B9b66\e(B  \e$B0j\e(B
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1998, 1999, 2000 @w{Yuuichi Teranishi},
-@w{Fujikazu Okunishi}, @w{Masahiro Murata},
-@w{Kenichi Okada}, and @w{Kaoru Takahashi}.
+Copyright @copyright{} 1998, 1999, 2000, 2001 @w{Yuuichi Teranishi},
+@w{Fujikazu Okunishi}, @w{Masahiro Murata}, @w{Kenichi Okada}, and
+@w{Kaoru Takahashi}.
 
 This manual is for Wanderlust version @value{VERSION}.
 
@@ -89,8 +89,8 @@ Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
 are preserved on all copies.
 
-\e$BCx:n8"I=<($H$3$N5v2DJ8$,$9$Y$F$NJ#@=$KB8:_$9$k8B$j!"\e(B
-\e$B$3$N@bL@=q$N$^$C$?$/F10l$NJ#@=$r:n$j!"G[I[$9$k$3$H$r5v2D$9$k!#\e(B
+\e$BCx:n8"I=<($H$3$N5v2DJ8$,$9$Y$F$NJ#@=$KB8:_$9$k8B$j!"$3$N@bL@=q$N$^$C$?$/\e(B
+\e$BF10l$NJ#@=$r:n$j!"G[I[$9$k$3$H$r5v2D$9$k!#\e(B
 
 Permission is granted to copy and distribute modified versions of this
 manual under the conditions for verbatim copying, provided that the entire
@@ -104,8 +104,8 @@ notice identical to this one.
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
 
-\e$B>e5-$N=$@5HG$K4X$9$k>r7o$N2<$G!"$3$N@bL@=q$NK]Lu$NJ#@=$r:n$j!"\e(B
-\e$BG[I[$9$k$3$H$r5v2D$9$k!#\e(B
+\e$B>e5-$N=$@5HG$K4X$9$k>r7o$N2<$G!"$3$N@bL@=q$NK]Lu$NJ#@=$r:n$j!"G[I[$9$k$3\e(B
+\e$B$H$r5v2D$9$k!#\e(B
 @end titlepage
 
 
@@ -114,11 +114,11 @@ into another language, under the above conditions for modified versions.
 @top Wanderlust \e$B%f!<%6%^%K%e%"%k\e(B
 
 @flushright
-Yuuichi Teranishi \e$B;{@>M50l\e(B
-Fujikazu Okunishi \e$B1|@>F#OB\e(B
-Masahiro Murata   \e$BB<EDA442\e(B
-Kenichi Okada     \e$B2,ED7r0l\e(B
-Kaoru Takahashi   \e$B9b66\e(B  \e$B0j\e(B
+\e$B;{@>M50l\e(B
+\e$B1|@>F#OB\e(B
+\e$BB<EDA442\e(B
+\e$B2,ED7r0l\e(B
+\e$B9b66\e(B  \e$B0j\e(B
 @end flushright
 
 \e$B$3$NJ8=q$O\e(B Wanderlust @value{VERSION} \e$B$KBP1~$7$^$9!#\e(B
@@ -197,11 +197,8 @@ Wanderlust \e$B$,@\B3$7$FF0:n$9$k$3$H$,3NG'$5$l$F$$$k\e(B IMAP \e$B%5!<%P$O0J2<$NDL
 \e$B$j$G$9!#\e(B
 
 @itemize @bullet
-@item UW imapd 4.1\e$B!A\e(B4.7, 4.7a, 4.7b, 4.7c
-@item Cyrus imapd 1.4
-@item Cyrus imapd 1.5.19
-@item Cyrus imapd 1.6.22
-@item Cyrus imapd 2.0.5
+@item UW imapd 4.1\e$B!A\e(B4.7, 4.7a, 4.7b, 4.7c, 2000 \e$B0J9_\e(B
+@item Cyrus imapd 1.4, 1.5.19, 1.6.22, 2.0.5 \e$B0J9_\e(B
 @item AIR MAIL (AIRC imapd release 2.00)
 @item Express Mail
 @item Microsoft Exchange Server 5.5
@@ -242,7 +239,7 @@ Wanderlust \e$B$r5/F0$9$k$^$G$KI,MW$J<j=g$r=gHV$K@bL@$7$^$9!#\e(B
 Wanderlust \e$B$r@5>o$KF0:n$5$;$k$K$O!"$^$:!"\e(BSEMI \e$B$b$7$/$O\e(B tm \e$B$,%$%s%9\e(B
 \e$B%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#\e(B
 
-Emacs19.28 \e$B0JA0$r%Y!<%9$H$7$?\e(B mule \e$B$r$*;H$$$N>l9g$O\e(B SEMI \e$B$,F0$+$J$$$O$:\e(B
+Emacs19.28 \e$B0JA0$r%Y!<%9$H$7$?\e(B Mule \e$B$r$*;H$$$N>l9g$O\e(B SEMI \e$B$,F0$+$J$$$O$:\e(B
 @footnote{Emacs 19.34 \e$B%Y!<%9$N\e(B Mule \e$B$G$O\e(B SEMI \e$B$rF0:n$5$;$k$3$H$b2DG=$G$9!#\e(B@*
 @uref{http://www.jpl.org/elips/INSTALL-SEMI-ja.html} \e$B$,;29M$K$J$j$^$9!#\e(B}
 \e$B$J$N$G\e(B tm \e$B$r%$%s%9%H!<%k$7$^$9!#\e(B
@@ -280,39 +277,21 @@ APEL, FLIM, SEMI \e$B$N=g$K%$%s%9%H!<%k$7$F$/$@$5$$!#\e(B
 \e$B?d>)$5$l$k\e(B APEL, FLIM, SEMI \e$B$N%P!<%8%g%s$NAH9g$;$O!"0J2<$NDL$j$G$9!#\e(B
 
 @itemize @minus
-@item APEL 10.2, FLIM 1.12.7, SEMI 1.13.4
-@item APEL 10.2, FLIM 1.13.2, SEMI 1.13.7
+@item APEL 10.3, FLIM 1.14.2, SEMI 1.14.3
 @end itemize
 
-APEL 10.2 \e$B$H\e(B FLIM 1.12.7 \e$B$NAH9g$;$G$O!"\e(BFLIM 1.12.7 \e$B$N%3%s%Q%$%k;~$K\e(B
-
-@example
-Please install latest APEL 7.3 or later.
-@end example
-   
-\e$B$H$$$&%(%i!<$,H/@8$9$k>l9g$,$"$j$^$9!#$3$N>l9g!"\e(B@file{FLIM-CFG} \e$B$N0J2<$N9T$r\e(B
-\e$B%3%a%s%H%"%&%H$7$F2<$5$$!#\e(B
-
-@lisp
-@group
-(or (fboundp 'write-region-as-binary)
-    (error "Please install latest APEL 7.3 or later."))
-(or (fboundp 'insert-file-contents-as-binary)
-    (error "Please install latest APEL 7.3 or later."))
-@end group
-@end lisp
-
 \e$B$=$NB>!"\e(BFLIM, SEMI \e$B$K$O$$$m$$$m$JJQ7A%P!<%8%g%s$,B8:_$7$^$9$,!"\e(B
 \e$B$=$l$i$N$$$:$l$bMxMQ$9$k$3$H$,2DG=$G$9!#\e(B
 \e$B4pK\E*$K:G?7HG$NAH9g$;$J$iF0:n$9$k$O$:$G$9!#\e(B
 \e$BNc$($P!"0J2<$NAH9g$;$NF0:n$,3NG'$5$l$F$$$^$9!#\e(B
 
 @itemize @minus
-@item APEL 10.2, Chao 1.14.1, REMI 1.14.1
+@item APEL 10.2, Chao 1.14.1, REMI 1.14.2
+@item APEL 10.2, SLIM 1.14.3, EMY 1.13.9
 @end itemize
 
-@c APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(B
-@c Wanderlust \e$B$r%$%s%9%H!<%k$7$J$*$7$F$/$@$5$$!#\e(B
+APEL, FLIM, SEMI \e$B$+\e(B tm \e$B$N%P!<%8%g%s%"%C%W$r9T$C$?>l9g$O!"\e(BWanderlust \e$B$r%$\e(B
+\e$B%s%9%H!<%k$7$J$*$7$F$/$@$5$$!#\e(B
 
 
 @node Download, Install, MIME Modules, Start Me Up
@@ -336,6 +315,7 @@ http://www.jpl.org/elips/wl/
 http://www.ring.gr.jp/archives/text/elisp/wl/
 ftp://ftp.ring.gr.jp/pub/text/elisp/wl/
 ftp://opaopa.org/pub/mirror/elisp/wl/
+@c ftp://roguelife.org/pub/tsumura/wl/
 @end group
 @end example
 
@@ -349,16 +329,16 @@ ftp://opaopa.org/pub/mirror/elisp/wl/
 @end group
 @end example
 
-@subsection SSL (Secure Socket Layer)\e$B$NMxMQ\e(B
+@subsection SSL (Secure Socket Layer) \e$B$NMxMQ\e(B
 @cindex SSL
 @pindex OpenSSL
 @pindex starttls
 
-Wanderlust \e$B$G$O!"\e(BSMTP, IMAP, NNTP, POP \e$B$N%3%M%/%7%g%s$K$*$$$F!"\e(B
-SSL (Secure Socket Layer) \e$B$rMQ$$$k$3$H$,$G$-$^$9!#\e(B
+Wanderlust \e$B$G$O!"\e(BSMTP, IMAP, NNTP, POP \e$B$N%3%M%/%7%g%s$K$*$$$F!"\e(BSSL
+(Secure Socket Layer) \e$B$rMQ$$$k$3$H$,$G$-$^$9!#\e(B
 
 SSL \e$B$NMxMQ7ABV$K$O\e(B2\e$B<oN`$"$j!"%3%M%/%7%g%s$HF1;~$K\e(B SSL negotiation \e$B$r;O$a\e(B
-\e$B$k$b$N$H!"\e(B@command{starttls} command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N\e(B
+\e$B$k$b$N$H!"\e(B@command{STARTTLS} command \e$B$N8e$K\e(B SSL negotiation \e$B$r;O$a$k$b$N\e(B
 \e$B$,$"$j$^$9!#\e(B
 
 \e$BDL>o$N\e(B SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils} \e$B%G%#%l%/%H%j$K$"$k\e(B
@@ -408,14 +388,13 @@ Cannot open load file: mime-setup
 @end example
 
 @noindent
-\e$B$H$$$&%(%i!<$,=P$k$3$H$,$"$j$^$9!#$3$N>l9g$O!"\e(B
-custom, APEL, FLIM, SEMI \e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @env{EMACSLOADPATH}
-\e$B$K2C$($k$+!"E83+%G%#%l%/%H%j$N\e(B @file{WL-CFG} \e$B$H$$$&%U%!%$%kCf$G\e(B
-@code{load-path} \e$B$rDL$7$F$*$/$H$h$$$G$7$g$&!#\e(B
+\e$B$H$$$&%(%i!<$,=P$k$3$H$,$"$j$^$9!#$3$N>l9g$O!"\e(Bcustom, APEL, FLIM, SEMI 
+\e$B$N%$%s%9%H!<%k@h$r4D6-JQ?t\e(B @env{EMACSLOADPATH}\e$B$K2C$($k$+!"E83+%G%#%l%/%H\e(B
+\e$B%j$N\e(B @file{WL-CFG} \e$B$H$$$&%U%!%$%kCf$G\e(B@code{load-path} \e$B$rDL$7$F$*$/$H$h$$\e(B
+\e$B$G$7$g$&!#\e(B
 
-\e$B$^$?!"\e(BBBDB \e$B$rMxMQ$7$?$$>l9g!"\e(BBBDB \e$B$X$b\e(B @code{load-path} \e$B$rDL$7$F$*$/$HI,MW$J%b\e(B
-\e$B%8%e!<%k$,%P%$%H%3%s%Q%$%k\e(B/\e$B%$%s%9%H!<%k$5$l$^$9!#\e(B
-@xref{BBDB}.
+\e$B$^$?!"\e(BBBDB \e$B$rMxMQ$7$?$$>l9g!"\e(BBBDB \e$B$X$b\e(B @code{load-path} \e$B$rDL$7$F$*$/$HI,\e(B
+\e$BMW$J%b%8%e!<%k$,%P%$%H%3%s%Q%$%k\e(B/\e$B%$%s%9%H!<%k$5$l$^$9!#\e(B@xref{BBDB}.
 
 @subsection @file{WL-CFG}
 
@@ -483,9 +462,9 @@ package \e$B$N%G%#%l%/%H%j$O\e(B SEMI \e$B$,%$%s%9%H!<%k$5$l$F$$$l$P<+F08!=P$5$l$^$
 
 @subsection \e$B%$%s%9%H!<%k$7$J$$$GMxMQ\e(B
 
-Wanderlust \e$B$O%P%$%H%3%s%Q%$%k!"%$%s%9%H!<%k$7$J$/$F$b!"\e(B@file{wl}, @file{elmo}
-\e$B$N%G%#%l%/%H%j$K\e(B @code{load-path} \e$B$,@_Dj$5$l$F$$$l$P5/F0$9$k$3$H$,$G$-$^$9!#\e(B
-\e$BNc$($P\e(B @file{~/work} \e$B$K%Q%C%1!<%8$rE83+$7$?>l9g!"\e(B
+Wanderlust \e$B$O%P%$%H%3%s%Q%$%k!"%$%s%9%H!<%k$7$J$/$F$b!"\e(B@file{wl},
+@file{elmo}\e$B$N%G%#%l%/%H%j$K\e(B @code{load-path} \e$B$,@_Dj$5$l$F$$$l$P5/F0$9$k\e(B
+\e$B$3$H$,$G$-$^$9!#Nc$($P\e(B @file{~/work} \e$B$K%Q%C%1!<%8$rE83+$7$?>l9g!"\e(B
 @file{~/.emacs} \e$B$K0J2<$N@_Dj$r$9$k$H5/F0$G$-$^$9!#\e(B
 
 @lisp
@@ -560,15 +539,14 @@ Wanderlust \e$B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#\e(B
 @end group
 @end lisp
 
-Wanderlust \e$B5/F08e!"\e(B@file{~/.wl} \e$B$,B8:_$9$l$P%m!<%I$5$l$^$9$N$G!"\e(BWanderlust \e$B$K\e(B
-\e$B8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7$g$&!#\e(B
-face \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B
-@file{~/.wl} \e$B$K=q$$$F$/$@$5$$!#\e(B
-@xref{Highlights}.
+Wanderlust \e$B5/F08e!"\e(B@file{~/.wl} \e$B$,B8:_$9$l$P%m!<%I$5$l$^$9$N$G!"\e(B
+Wanderlust \e$B$K8GM-$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$7$F$*$1$P@0M}$7$d$9$$$G$7$g\e(B
+\e$B$&!#\e(Bface \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B@file{~/.wl} 
+\e$B$K=q$$$F$/$@$5$$!#\e(B@xref{Highlights}.
 
-\e$B>e5-$N$&$A!"\e(B@samp{(load "mime-setup")} \e$B$H\e(B autoload \e$B$N@_Dj$O\e(B
-@file{~/.emacs} \e$B$K=q$/I,MW$,$"$j$^$9!#\e(B
-\e$B$=$l0J30$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-=R$G$-$^$9!#\e(B
+\e$B>e5-$N$&$A!"\e(B@samp{(load "mime-setup")} \e$B$H\e(B @code{autoload} \e$B$N@_Dj$O\e(B
+@file{~/.emacs} \e$B$K=q$/I,MW$,$"$j$^$9!#$=$l0J30$N@_Dj$O\e(B @file{~/.wl} \e$B$K5-\e(B
+\e$B=R$G$-$^$9!#\e(B
 
 @subsection @code{mail-user-agent}
 @cindex Default Mailer
@@ -578,9 +556,9 @@ face \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B
 
 \e$B0J2<$N$h$&$J@_Dj$r\e(B @file{.emacs} \e$BEy$K$7$F$*$/$H!"\e(B@kbd{C-x m}
 (@code{compose-mail}) \e$BEy$K$h$C$F\e(B Wanderlust \e$B$N%I%i%U%H%b!<%I$,5/F0$5$l$k\e(B
-\e$B$h$&$K$J$j$^$9!#\e(BWanderlust \e$B$r\e(B Emacs \e$B>e$NI8=`%a!<%i$H$7$F;H$$$?$$>l9g$O\e(B
-\e$B@_Dj$7$F$*$/$H$h$$$G$7$g$&!#\e(B
-\e$B$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,2DG=$J\e(B Emacsen \e$B$N>l9g$N$_M-8z$G$9!#\e(B
+\e$B$h$&$K$J$j$^$9!#\e(BWanderlust \e$B$r\e(B Emacs \e$B>e$NI8=`%a!<%i$H$7$F;H$$$?$$>l9g$O@_\e(B
+\e$BDj$7$F$*$/$H$h$$$G$7$g$&!#$?$@$7!"$3$l$O\e(B @code{mail-user-agent} \e$B$NDj5A$,\e(B
+\e$B2DG=$J\e(B Emacsen \e$B$N>l9g$N$_M-8z$G$9!#\e(B
 @xref{Mail Methods, , ,emacs-ja, The Emacs Editor}.
 
 @lisp
@@ -605,13 +583,14 @@ face \e$B$N@_Dj$O\e(B @file{~/.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B
 @cindex .addresses
 @cindex Alias, Address
 
-\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
+\e$B%"%I%l%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OHt$P$7$F$b9=$$\e(B
+\e$B$^$;$s!#\e(B
 
+\e$B%"%I%l%9%U%!%$%k\e(B @file{~/.addresses} \e$B$r:n@.$7!"<+J,MQ$KJT=8$7$^$9!#\e(B
 @file{~/.addresses} \e$B$K=q$+$l$?%G!<%?$O!"%I%i%U%H:n@.;~$N%"%I%l%9Jd40%G!<\e(B
-\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#%"%I%l\e(B
-\e$B%9Jd40$d%5%^%j$NI=<($K6E$kI,MW$,$J$$>l9g$O!"$3$N9`$OHt$P$7$F$b9=$$$^$;$s!#\e(B
-\e$B$^$?!"5/F0$7$?$"$H$G%5%^%j$N%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9\e(B
-\e$B$rDI2C\e(B/\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
+\e$B%?$H$7$FMxMQ$5$l$k$[$+!"%5%^%jI=<($G$NL>A0I=<(Ey$K$bMQ$$$i$l$^$9!#$^$?!"\e(B
+\e$B5/F0$7$?$"$H$G%5%^%j$N%P%C%U%!$+$i\e(B @file{~/.addresses} \e$B$K%"%I%l%9$rDI2C\e(B/
+\e$BJQ99\e(B/\e$B:o=|$9$k$3$H$b2DG=$G$9!#\e(B
 
 \e$B=q$-J}$O$H$F$bC1=c$G$9!#$3$s$J$+$s$8$G$9!#\e(B
 
@@ -637,8 +616,8 @@ bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
 \e$B$o$+$j$d$9$$$H;W$o$l$^$9!#$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%"%I%l%9D"$N\e(B
 \e$BDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#\e(B
 
-\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$N%U%!%$%k$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F\e(B
-\e$B$$$l$P!"%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
+\e$B$^$?!"JQ?t\e(B @code{wl-alias-file} \e$B$K\e(B MH \e$B$N\e(B alias file \e$B$,;XDj$5$l$F$$$l$P!"\e(B
+\e$B%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$F;H$o$l$^$9!#\e(B
 
 \e$B$5$i$K!"JQ?t\e(B @code{wl-use-ldap} (\e$B=i4|@_Dj$O\e(B @code{nil}) \e$B$r\e(B non-nil \e$B$K@_\e(B
 \e$BDj$9$k$H!"\e(BLDAP \e$B%5!<%P$N>pJs$r%I%i%U%H:n@.;~$N%"%I%l%9>pJs$H$7$FMxMQ$7$^\e(B
@@ -646,8 +625,9 @@ bar@@foo.gohome.org             "Bar \e$B$5$s\e(B"      "Michael Bar"
 
 LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 @code{wl-ldap-base} \e$B$bE,@Z$K@_Dj$7$F2<$5$$!#$^$?!"\e(BLDAP \e$BBP1~$N\e(B XEmacs \e$B0J\e(B
-\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B ldapsearch \e$B$rMxMQ$7$^$9$N$G!"\e(Bldapsearch \e$B$X\e(B
-\e$B$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"$j$^$9!#\e(B
+\e$B30$G$O!"30It%W%m%0%i%`$H$7$F\e(B @command{ldapsearch} \e$B$rMxMQ$7$^$9$N$G!"\e(B
+@command{ldapsearch} \e$B$X$"$i$+$8$a%3%^%s%I<B9T%Q%9$r@_Dj$7$F$*$/I,MW$,$"\e(B
+\e$B$j$^$9!#\e(B
 
 @node Folder Definition, Start Wanderlust, Mail Addresses, Start Me Up
 @section \e$B9XFI$9$k%U%)%k%@$NDj5A\e(B
@@ -679,7 +659,7 @@ LDAP \e$B$rMxMQ$9$k>l9g$O!"\e(B@code{wl-ldap-server}\e$B!"\e(B@code{wl-ldap-port},
 Emacsen@{
     %#mh/spool/wl            "Wanderlust ML"
     %#mh/spool/elips         "ELIPS ML"
-    %#mh/spool/tm-ja         "tm (\e$BF|K\8l\e(B) ML"
+    %#mh/spool/apel-ja       "APEL (\e$BF|K\8l\e(B) ML"
     %#mh/spool/xemacs-beta   "XEmacs \e$B%Y!<%?\e(B"
     -fj.news.reader.gnus@@other.nntp.server.com
     *-fj.editor.xemacs,-fj.editor.mule,-fj.editor.emacs "fj \e$B$N\e(B Emacsen"
@@ -697,20 +677,20 @@ Emacsen@{
 \e$B0l9T$K$R$H$D!"FI$_$?$$%U%)%k%@$r=q$-$^$9!#\e(B
 \e$B3F%U%)%k%@$NDj5A$K$D$$$F$O<!$N>O$G>\$7$/@bL@$7$^$9!#\e(B
 
-@samp{@var{\e$B%0%k!<%WL>\e(B}@{} \e$B$H\e(B @samp{@}} \e$B$G0O$^$l$?ItJ,$O0l$D$N%0%k!<%W$H$J$j$^$9!#\e(B
-\e$B$R$H$D$N%0%k!<%W$O%U%)%k%@%b!<%I$G$O3+JD$G$-$k%G%#%l%/%H%j$N$h$&$K8+$($^$9!#\e(B
-\e$B$$$/$D$+$N%U%)%k%@$r$^$H$a$F@0M}$9$k$N$KJXMx$G$9!#\e(B
+@samp{@var{\e$B%0%k!<%WL>\e(B}@{} \e$B$H\e(B @samp{@}} \e$B$G0O$^$l$?ItJ,$O0l$D$N%0%k!<%W$H\e(B
+\e$B$J$j$^$9!#$R$H$D$N%0%k!<%W$O%U%)%k%@%b!<%I$G$O3+JD$G$-$k%G%#%l%/%H%j$N$h\e(B
+\e$B$&$K8+$($^$9!#$$$/$D$+$N%U%)%k%@$r$^$H$a$F@0M}$9$k$N$KJXMx$G$9!#\e(B
 
-\e$BCm0U$9$Y$-$J$N$O!"\e(B@samp{@var{\e$B%0%k!<%WL>\e(B}@{} \e$B$H\e(B @samp{@}} \e$B$O#19T$r@jNN$7$F=q$/\e(B
-\e$BI,MW$,$"$k$3$H$G$9\e(B(\e$B$3$l$O%Q!<%5$,%@%5$$$+$i$G$9\e(B)\e$B!#\e(B
+\e$BCm0U$9$Y$-$J$N$O!"\e(B@samp{@var{\e$B%0%k!<%WL>\e(B}@{} \e$B$H\e(B @samp{@}} \e$B$O#19T$r@jNN$7\e(B
+\e$B$F=q$/I,MW$,$"$k$3$H$G$9\e(B(\e$B$3$l$O%Q!<%5$,%@%5$$$+$i$G$9\e(B)\e$B!#\e(B
 
-\e$B%0%k!<%W$K$O!"#2$D$N<oN`$,$"$j$^$9!#0l$D$O!">e$NNc$N\e(B @samp{Emacsen} \e$B$N$h$&$K\e(B
-\e$BD>@\<+J,$G9%$-$J%U%)%k%@$r%0%k!<%W$H$7$FDj5A$9$k%?%$%W$G$9!#\e(B
+\e$B%0%k!<%W$K$O!"#2$D$N<oN`$,$"$j$^$9!#0l$D$O!">e$NNc$N\e(B @samp{Emacsen} \e$B$N$h\e(B
+\e$B$&$KD>@\<+J,$G9%$-$J%U%)%k%@$r%0%k!<%W$H$7$FDj5A$9$k%?%$%W$G$9!#\e(B
 
-\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#\e(B
-\e$B$3$l$O!"$"$k%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$r0l$D$N%0%k!<%W$H$9$k$b$N$G$9!#\e(B
-(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(B
- MH \e$B$N%5%V%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
+\e$B$b$&0l$D$O!">e$NNc$N\e(B @samp{+} \e$B$N$h$&$J\e(B @dfn{\e$B%"%/%;%9%0%k!<%W\e(B} \e$B$G$9!#$3$l\e(B
+\e$B$O!"$"$k%U%)%k%@$K4^$^$l$k%5%V%U%)%k%@A4$F$r0l$D$N%0%k!<%W$H$9$k$b$N$G$9!#\e(B
+(\e$B$3$l$O%U%)%k%@$N%?%$%W$K$h$C$F0c$$$^$9!#Nc$($P\e(B @samp{+} \e$B$J$i\e(B MH \e$B$N%5%V\e(B
+\e$B%G%#%l%/%H%j$9$Y$F$,$R$H$D$N%0%k!<%W$H$J$j$^$9!#\e(B)
 
 \e$B<B:]$K;n$7$F$_$F!"3NG'$7$F$+$i$NJ}$,$o$+$j$d$9$$$H;W$o$l$^$9!#\e(B
 \e$B$A$g$C$H=q$$$F;n$7$F$_$F$+$i!"$^$?%U%)%k%@$NDj5A$r$d$j$J$*$9$N$,$h$$$G$7$g$&!#\e(B
@@ -743,9 +723,9 @@ M-x wl
 Wanderlust \e$B$O\e(B ELMO \e$B$N%$%s%?%U%'!<%9$rMxMQ$7$F$$$k$?$a!"\e(BELMO \e$B%b%8%e!<%k$K\e(B
 \e$B$h$C$F%5%]!<%H$5$l$F$$$l$P!"$I$s$J%U%)%k%@$G$bMxMQ$9$k$3$H$,$G$-$^$9!#\e(B
 
-\e$B%P!<%8%g%s\e(B @value{VERSION} \e$B8=:_!"MQ0U$5$l$F$$$k%U%)%k%@$O!"\e(B
-IMAP, NNTP, LocalDir(MH), Maildir, News Spool, POP, Archive, 
-Multi, Filter, Pipe, Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
+\e$B%P!<%8%g%s\e(B @value{VERSION} \e$B8=:_!"MQ0U$5$l$F$$$k%U%)%k%@$O!"\e(BIMAP, NNTP,
+LocalDir(MH), Maildir, News Spool, POP, Archive, Multi, Filter, Pipe,
+Internal \e$B$N\e(B 10 \e$B<oN`$G$9!#\e(B
 
 @menu
 * IMAP Folder::              @samp{%} -- IMAP \e$B%U%)%k%@\e(B
@@ -783,11 +763,10 @@ RFC 2060 \e$B$G5,Dj$5$l$?\e(B IMAP4rev1 \e$B$rMxMQ$7$F%a!<%k$rFI$`$?$a$N%U%)%k%@$G$
 @var{\e$BG'>ZK!\e(B}\e$B$K$O\e(B @code{login} (\e$B%(%s%3!<%I$7$F%Q%9%o!<%I$rAw?.\e(B)\e$B$+\e(B
            @code{cram-md5} (CRAM-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
            @code{digest-md5} (DIGEST-MD5 \e$B$K$h$kG'>Z\e(B)\e$B$+\e(B
-           @code{plain} (\e$B$^$?$O\e(B @code{nil}\e$B!#@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
+           @code{clear} (\e$B$^$?$O\e(B @code{nil}\e$B!#@8%Q%9%o!<%I$rAw?.\e(B) \e$B$N$$$:$l$+$r;XDj!#\e(B
 @end example
 
-(CRAM-MD5 \e$B$d\e(B DIGEST-MD5 \e$B$K$h$kG'>Z$r9T$J$&$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B
-@file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B)
+(1.14.0 \e$B$h$j0JA0$N%P!<%8%g%s$N\e(B FLIM \e$B$G\e(B CRAM-MD5 \e$B$d\e(B DIGEST-MD5 \e$B$K$h$kG'>Z$r9T$J$&$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$,$"$j$^$9!#\e(B1.14.0 \e$B0J9_$N%P!<%8%g%s$N\e(B FLIM \e$B$G$"$l$P!"K\%Q%C%1!<%8$N\e(B @file{utils/sasl} \e$B$r%$%s%9%H!<%k$9$kI,MW$O$"$j$^$;$s!#\e(B)
 
 default \e$BCM\e(B:
 
@@ -809,10 +788,10 @@ default \e$BCM\e(B:
 \e$B$&$K;XDj$G$-$^$9!#\e(B
 
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL (Secure Socket Layer)\e$B$r\e(B
-\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS\e$B$K$h$j\e(B
-SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-imap4-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
-\e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
+\e$BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(BSSL\e$B%3%M%/\e(B
+\e$B%7%g%s$rD%$j$^$9!#JQ?t\e(B @code{elmo-default-imap4-stream-type} \e$B$NCM$,\e(B 
+non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B'starttls \e$B$J$i\e(B 
+@samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
 (SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
 \e$B$kI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @command{openssl} \e$B$K%Q%9$,\e(B
@@ -822,8 +801,8 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 \e$BG'>ZK!$H$7$F!"\e(B@code{login}\e$B!"\e(B@code{cram-md5} \e$B$b$7$/$O\e(B @code{digest-md5} 
 \e$B$r;XDj$7$?>l9g!"%Q%9%o!<%I$r%(%s%3!<%I$7$FAw?.$7$^$9!#$?$@$7!"%5!<%PB&$,\e(B
 \e$B%Q%9%o!<%I$r%(%s%3!<%I$7$F<u$1<h$kG=NO$,L5$$>l9g$O!"3NG'$N$N$A!"\e(B
-@code{plain} (\e$B@8%Q%9%o!<%I$rAw$k\e(B) \e$B$K@ZBX$($^$9!#JQ?t\e(B 
-@code{elmo-imap4-force-login} \e$B$,\e(B non-nil \e$B$J$i$P!"3NG'L5$7$K\e(B @code{plain} 
+@code{clear} (\e$B@8%Q%9%o!<%I$rAw$k\e(B) \e$B$K@ZBX$($^$9!#JQ?t\e(B 
+@code{elmo-imap4-force-login} \e$B$,\e(B non-nil \e$B$J$i$P!"3NG'L5$7$K\e(B @code{clear} 
 \e$B$K@ZBX$($^$9\e(B(\e$B=i4|@_Dj$O\e(B @code{nil})\e$B!#\e(B
 
 \e$BNc\e(B:
@@ -834,9 +813,9 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 %#mh/inbox -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"#mh/inbox"
 
 %inbox:hoge -> IMAP \e$B$N%a!<%k%\%C%/%9!"\e(B"inbox" \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
-%inbox:hoge/plain@@server1
+%inbox:hoge/clear@@server1
             -> server1 \e$B>e$N\e(B IMAP \e$B$N%a!<%k%\%C%/%9\e(B "inbox" \e$B$X\e(B
-               \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B('plain \e$B$G\e(B)
+               \e$B%f!<%6\e(B "hoge" \e$B$G!"@8%Q%9%o!<%I$rAw$C$F\e(B('clear \e$B$G\e(B)
                \e$B%"%/%;%9!#\e(B
 @end group
 @end example
@@ -845,13 +824,14 @@ SSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
 @cindex Modified UTF7
 @cindex UTF7
 @cindex UTF8
+@cindex Unicode
 @pindex Mule-UCS
 @pindex ucs-conv
 
 \e$B;HMQ$7$F$$$k\e(B Emacs \e$B$,%f%K%3!<%I$KBP1~$7$F$*$j!$$+$D!"JQ?t\e(B 
 @code{elmo-imap4-use-modified-utf7} \e$B$K\e(B non-nil \e$B$NCM$r@_Dj$7$F$$$k>l9g\e(B(\e$B%G\e(B
-\e$B%U%)%k%H$O\e(B nil)\e$B!"F|K\8l\e(B(\e$B$d$=$NB>$N1Q8l0J30$N8@8l\e(B)\e$B$G%a!<%k%\%C%/%9L>$r\e(B
-\e$B;XDj$9$k$3$H$,$G$-$^$9!#\e(B
+\e$B%U%)%k%H$O\e(B @code{nil})\e$B!"F|K\8l\e(B(\e$B$d$=$NB>$N1Q8l0J30$N8@8l\e(B)\e$B$G%a!<%k%\%C%/%9\e(B
+\e$BL>$r;XDj$9$k$3$H$,$G$-$^$9!#\e(B
 
 \e$B%f%K%3!<%I$r07$($k\e(B Emacs \e$B$K$O0J2<$,$"$j$^$9!#\e(B
 
@@ -878,9 +858,9 @@ cvs -d :pserver:anonymous@@cvs.m17n.org:/cvs/root checkout ucs-conv
 @end group
 @end example
 
-\e$B$^$?!$\e(BXEmacs \e$B$GF|K\8l%U%)%k%@L>$r07$&$K$O!"$5$i$K!"%3%^%s%I\e(B @code{u7tou8},
-@code{u8tou7} \e$B$,%$%s%9%H!<%k$5$l$F$$$kI,MW$,$"$j$^$9!#$3$l$i$N%3%^%s%I$O0J2<$+\e(B
-\e$B$iF~<j$G$-$k\e(B UTF7 \e$B%Q%C%1!<%8$K4^$^$l$F$$$^$9!#\e(B
+\e$B$^$?!$\e(BXEmacs \e$B$GF|K\8l%U%)%k%@L>$r07$&$K$O!"$5$i$K!"%3%^%s%I\e(B 
+@command{u7tou8}, @command{u8tou7} \e$B$,%$%s%9%H!<%k$5$l$F$$$kI,MW$,$"$j$^\e(B
+\e$B$9!#$3$l$i$N%3%^%s%I$O0J2<$+$iF~<j$G$-$k\e(B UTF7 \e$B%Q%C%1!<%8$K4^$^$l$F$$$^$9!#\e(B
 
 @example
 ftp://ftp.ifcss.org/pub/software/unix/convert/utf7.tar.gz
@@ -913,8 +893,8 @@ default \e$BCM\e(B:
 
 @var{\e$B%f!<%6L>\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(BAUTHINFO\e$B$K$h$kG'>Z$r9T$J$$$^$9!#\e(B
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-@samp{!!} \e$B$@$H!"\e(BSTARTTLS\e$B$K$h$j\e(BSSL\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-nntp-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+@samp{!!} \e$B$@$H!"\e(BSTARTTLS \e$B$K$h$j\e(B SSL \e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B
+\e$BJQ?t\e(B @code{elmo-default-nntp-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 
 (SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9\e(B
@@ -926,8 +906,8 @@ default \e$BCM\e(B:
 
 @example
 @group
--fj.rec.tv            -> \e$B%K%e!<%9%0%k!<%W!"\e(Bfj.rec.tv\e$B!#\e(B
--fj.rec.tv@@newsserver -> newsserver \e$B>e$N%K%e!<%9%0%k!<%W!"\e(Bfj.rec.tv\e$B!#\e(B
+-fj.rec.tv            -> \e$B%K%e!<%9%0%k!<%W!"\e(B@samp{fj.rec.tv}\e$B!#\e(B
+-fj.rec.tv@@newsserver -> @samp{newsserver} \e$B>e$N%K%e!<%9%0%k!<%W!"\e(B@samp{fj.rec.tv}\e$B!#\e(B
 @end group
 @end example
 
@@ -958,9 +938,9 @@ MH \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$N%U%)
 
 @example
 @group
-+inbox         -> "~/Mail/inbox"
-+from/teranisi -> "~/Mail/from/teranisi"
-+~/test        -> "~/test"
++inbox         -> @file{~/Mail/inbox}
++from/teranisi -> @file{~/Mail/from/teranisi}
++~/test        -> @file{~/test}
 @end group
 @end example
 
@@ -979,15 +959,16 @@ Maildir \e$B7A<0\e(B(1\e$B%U%!%$%k\e(B1\e$B%a!<%k\e(B)\e$B$GJ]B8$5$l$?%a!<%k$rFI$`$?$a$
 @samp{.} @var{\e$B%G%#%l%/%H%jL>\e(B}
 @end example
 
-@var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"DL>o!"JQ?t\e(B @code{elmo-maildir-folder-path} (\e$B=i4|@_Dj$O\e(B 
-@file{~/Maildir}) \e$B$+$i$NAjBP%Q%9$G$9$,!"\e(B@samp{/} \e$B$d\e(B @samp{~} \e$B$G;O$^$C$F\e(B
-\e$B$$$l$P@dBP%Q%9$H8+Pv$7$^$9\e(B(\e$B%I%i%$%V%l%?!<$bF1MM$G$9\e(B)\e$B!#\e(B
+@var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"DL>o!"JQ?t\e(B @code{elmo-maildir-folder-path} (\e$B=i4|\e(B
+\e$B@_Dj$O\e(B @file{~/Maildir}) \e$B$+$i$NAjBP%Q%9$G$9$,!"\e(B@samp{/} \e$B$d\e(B @samp{~} \e$B$G;O\e(B
+\e$B$^$C$F$$$l$P@dBP%Q%9$H8+Pv$7$^$9\e(B(\e$B%I%i%$%V%l%?!<$bF1MM$G$9\e(B)\e$B!#\e(B
 
-Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$$^$9!#\e(B
-\e$B<B:]$K%a%C%;!<%8$,4^$^$l$k$N$O!";XDj%G%#%l%/%H%jD>2<$N\e(B @file{cur} \e$B%G%#%l%/%H%j$G$9!#\e(B
-\e$B;XDj%G%#%l%/%H%jD>2<$N\e(B @file{new} \e$B%G%#%l%/%H%j$K4^$^$l$k%a%C%;!<%8%U%!%$%k$O!"\e(B
-\e$B%"%/%;%9;~$K\e(B @file{cur} \e$B%G%#%l%/%H%j$X0\F0$5$l$^$9!#\e(B
-\e$B$^$?!"\e(B@file{tmp} \e$B%G%#%l%/%H%j$K4^$^$l!"\e(B36 \e$B;~4V0J>e%"%/%;%9$,L5$$%a%C%;!<%8%U%!%$%k$O:o=|$5$l$^$9!#\e(B
+Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$\e(B
+\e$B$^$9!#<B:]$K%a%C%;!<%8$,4^$^$l$k$N$O!";XDj%G%#%l%/%H%jD>2<$N\e(B @file{cur} 
+\e$B%G%#%l%/%H%j$G$9!#;XDj%G%#%l%/%H%jD>2<$N\e(B @file{new} \e$B%G%#%l%/%H%j$K4^$^$l\e(B
+\e$B$k%a%C%;!<%8%U%!%$%k$O!"%"%/%;%9;~$K\e(B @file{cur} \e$B%G%#%l%/%H%j$X0\F0$5$l$^\e(B
+\e$B$9!#$^$?!"\e(B@file{tmp} \e$B%G%#%l%/%H%j$K4^$^$l!"\e(B36 \e$B;~4V0J>e%"%/%;%9$,L5$$%a%C\e(B
+\e$B%;!<%8%U%!%$%k$O:o=|$5$l$^$9!#\e(B
 
 \e$B$3$NF0:n$O\e(B @uref{http://cr.yp.to/proto/maildir.html} \e$B$K=>$C$F$$$^$9!#\e(B@*
 (\e$BF|K\8lLu$O\e(B @uref{http://www.jp.qmail.org/q103/jman5/maildir.html})
@@ -996,10 +977,10 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 
 @example
 @group
-.              -> "~/Maildir"
-.inbox         -> "~/Maildir/inbox"
-.from/teranisi -> "~/Maildir/from/teranisi"
-.~/test        -> "~/test"
+.              -> @file{~/Maildir}
+.inbox         -> @file{~/Maildir/inbox}
+.from/teranisi -> @file{~/Maildir/from/teranisi}
+.~/test        -> @file{~/test}
 @end group
 @end example
 
@@ -1011,8 +992,8 @@ Maildir \e$B$O!"\e(B@file{cur}, @file{new}, @file{tmp} \e$B$N%G%#%l%/%H%j$r4^$s$G$$
 @pindex gnspool
 
 Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
-\e$B%U%)%k%@$G$9!#\e(BNNTP \e$B7PM3$G$O$J$/!"\e(Bgnspool \e$B$J$I$r;H$C$F<h$j4s$;$F$$$k$h$&\e(B
-\e$B$J>l9g$K$=$N%9%W!<%k$rD>@\FI$`!"$H$$$&;H$$J}$bA[Dj$7$F$$$^$9!#\e(B
+\e$B%U%)%k%@$G$9!#\e(BNNTP \e$B7PM3$G$O$J$/!"\e(B@command{gnspool} \e$B$J$I$r;H$C$F<h$j4s$;\e(B
+\e$B$F$$$k$h$&$J>l9g$K$=$N%9%W!<%k$rD>@\FI$`!"$H$$$&;H$$J}$bA[Dj$7$F$$$^$9!#\e(B
 
 \e$B=q<0\e(B:
 
@@ -1020,17 +1001,16 @@ Mew/IM \e$B$,Ds>'$9$k!"%m!<%+%k$KJ]B8$5$l$?%K%e!<%95-;v$rFI$_=q$-$9$k$?$a$N\e(B
 @samp{=} @var{\e$B%G%#%l%/%H%jL>\e(B}
 @end example
 
-@var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"JQ?t\e(B @code{elmo-localnews-folder-path}
- (\e$B=i4|@_Dj$O\e(B @file{~/News})
-\e$B$G;XDj$5$l$?%G%#%l%/%H%j$N%5%V%G%#%l%/%H%j$r;X$7$^$9!#\e(B
+@var{\e$B%G%#%l%/%H%jL>\e(B}\e$B$O!"JQ?t\e(B @code{elmo-localnews-folder-path} (\e$B=i4|@_Dj\e(B
+\e$B$O\e(B @file{~/News})\e$B$G;XDj$5$l$?%G%#%l%/%H%j$N%5%V%G%#%l%/%H%j$r;X$7$^$9!#\e(B
 \e$B%G%#%l%/%H%j$N6h@Z$j$O\e(B @samp{.} \e$B$G$b2D$G$9!#\e(B
 
 \e$BNc\e(B:
 
 @example
 @group
-=fj/os/os2         -> "~/News/fj/os/os2"
-=fj.os.bsd.freebsd -> "~/News/fj/os/bsd/freebsd"
+=fj/os/os2         -> @file{~/News/fj/os/os2}
+=fj.os.bsd.freebsd -> @file{~/News/fj/os/bsd/freebsd}
 @end group
 @end example
 
@@ -1068,9 +1048,10 @@ ange-ftp \e$BI=5-$b\e(B ange-ftp, efs \e$B$,;H$($k4D6-$G$O\e(B OK \e$B$G$9!#\e(B
 (\e$B=i4|@_Dj$O\e(B @code{zip})\e$B$,;2>H$5$l$^$9!#\e(B
 
 @var{\e$B%W%l%U%#%/%9\e(B}\e$B$O!"=q8K$,%G%#%l%/%H%j9=B$$r$b$C$F$$$k>l9g$K!"$=$N%G%#\e(B
-\e$B%l%/%H%jItJ,$r;XDj$7$^$9!#$3$l$O<g$K%"!<%+%$%V%5!<%S%9$d\e(B tar + gzip +
-uuencode \e$B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k\e(B ML \e$B$N=q8K%U%!%$%k$rE83+$9\e(B
-\e$B$k$3$H$J$/%^%&%s%H$9$k$?$a$N$b$N!"$D$^$j1\Mw;~$NJX59$N$?$a$N$b$N$G$9!#\e(B
+\e$B%l%/%H%jItJ,$r;XDj$7$^$9!#$3$l$O<g$K%"!<%+%$%V%5!<%S%9$d\e(B @command{tar} +
+@command{gzip} + @command{uuencode} \e$B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k\e(B 
+ML \e$B$N=q8K%U%!%$%k$rE83+$9$k$3$H$J$/%^%&%s%H$9$k$?$a$N$b$N!"$D$^$j1\Mw;~\e(B
+\e$B$NJX59$N$?$a$N$b$N$G$9!#\e(B
 
 \e$BNc$($P\e(B ML \e$B%5!<%P$,\e(B fml \e$B$N>l9g!"\e(B@file{msend.tar.gz} \e$B$O\e(B @file{spool/1} \e$B$N\e(B
 \e$B$h$&$J9=B$$J$N$G!"\e(B@samp{spool} \e$B$r;XDj$7$^$9!#\e(B
@@ -1079,10 +1060,10 @@ uuencode \e$B$K$h$k%@%$%8%'%9%HG[Aw$rDs6!$7$F$$$k\e(B ML \e$B$N=q8K%U%!%$%k$rE83+$9
 
 @example
 @group
-$teranisi         -> "~/Mail/teranisi/elmo-archive.zip"
-$bsd/freebsd;lha  -> "~/Mail/bsd/freebsd/elmo-archive.lzh"
-$/foo@@server:~/bar;zoo     -> server \e$B>e$N\e(B "~/bar/elmo-archive.zoo"
-$d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
+$teranisi         -> @file{~/Mail/teranisi/elmo-archive.zip}
+$bsd/freebsd;lha  -> @file{~/Mail/bsd/freebsd/elmo-archive.lzh}
+$/foo@@server:~/bar;zoo     -> @samp{server} \e$B>e$N\e(B @file{~/bar/elmo-archive.zoo}
+$d:/msend.tar.gz;tgz;spool -> @file{d:/msend.tar.gz}
 @end group
 @end example
 
@@ -1109,16 +1090,17 @@ $d:/msend.tar.gz;tgz;spool -> "d:/msend.tar.gz"
 @example
 @group
         LHA, Info-ZIP/UNZIP, ZOO, RAR  ;; \e$B%U%k%9%Z%C%/\e(B
-        GNU TAR('tgz, 'tar)            ;; \e$B%G%U%)%k%H$G$O1\Mw@lMQ\e(B
+        GNU TAR(@code{tgz}, @code{tar}) ;; \e$B%G%U%)%k%H$G$O1\Mw@lMQ\e(B
 @end group
 @end example
 
-\e$BJ#?t%U%!%$%k$r#1%W%m%;%9$G0l$D$N=q8K$X$^$H$a$k$3$H$,$G$-$k%"!<%+%$%P$G\e(B
-\e$B$"$l$P!"I,MW$JJQ?t$rDI2CDj5A$9$k$@$1$G;H$($k2DG=@-$,$"$j$^$9\e(B(ARJ/UNARJ,
+\e$BJ#?t%U%!%$%k$r#1%W%m%;%9$G0l$D$N=q8K$X$^$H$a$k$3$H$,$G$-$k%"!<%+%$%P$G$"\e(B
+\e$B$l$P!"I,MW$JJQ?t$rDI2CDj5A$9$k$@$1$G;H$($k2DG=@-$,$"$j$^$9\e(B(ARJ/UNARJ,
 ARC \e$B$O!"<j5v$G;H$C$F$J$$$N$GDj5A$7$F$$$^$;$s!#\e(BTAR \e$B$O85%U%!%$%k$r>C$9\e(B
-('mv) \e$B$3$H$,$G$-$J$$E@$G??LLL\$K%5%]!<%H$7$F$$$^$;$s\e(B)\e$B!#\e(B
-\e$BJ#?t%U%!%$%k$r0l$D$K$^$H$a$i$l$J$$E@$G\e(B gzip, bzip, bzip2 \e$B$O;H$($^$;$s!#\e(B
-\e$BI8=`=PNO$X2rE`$G$-$J$$%"!<%+%$%P$K$bI8=`$G$OBP1~$7$^$;$s!#\e(B
+(@code{mv}) \e$B$3$H$,$G$-$J$$E@$G??LLL\$K%5%]!<%H$7$F$$$^$;$s\e(B)\e$B!#J#?t%U%!%$\e(B
+\e$B%k$r0l$D$K$^$H$a$i$l$J$$E@$G\e(B @command{gzip}, @command{bzip},
+@command{bzip2} \e$B$O;H$($^$;$s!#I8=`=PNO$X2rE`$G$-$J$$%"!<%+%$%P$K$bI8=`$G\e(B
+\e$B$OBP1~$7$^$;$s!#\e(B
 
 @subsection \e$B3F\e(B OS \e$B$G$N%"!<%+%$%P$K4X$9$kFC5-;v9`\e(B
 
@@ -1168,14 +1150,13 @@ GNU tar \e$B$O=q8K$+$i$N:o=|$KLdBj$,$"$k$b$N$,B?$$$N$G!"FC$KCm0U$7$F$/$@$5$$!#\e(B
 @subsection TIPS
 @cindex Archive Tips
 
-\e$B2wE,$K0\9T$9$k$K$O!"\e(B@code{wl-summary-archive} \e$B$r<B9T$9$k\e(B (@pxref{Archive}) \e$B$+!"\e(B
-Expire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$$G$7$g$&!#\e(B
-\e$B$?$@$7!"\e(BExpire \e$B5!G=$G:n@.$7$?%"!<%+%$%V%U%)%k%@$r07$&>l9g$O!"\e(B
+\e$B2wE,$K0\9T$9$k$K$O!"\e(B@code{wl-summary-archive} \e$B$r<B9T$9$k\e(B 
+(@pxref{Archive}) \e$B$+!"\e(BExpire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$\e(B
+\e$B$G$7$g$&!#$?$@$7!"\e(BExpire \e$B5!G=$G:n@.$7$?%"!<%+%$%V%U%)%k%@$r07$&>l9g$O!"\e(B
 \e$BJQ?t\e(B @code{elmo-archive-treat-file} \e$B$r\e(B non-nil \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#\e(B
 \e$B$J$*!"\e(BOS/2 \e$B>e$G$N%F%9%H$G$O!"\e(BMule2.3(19.28) \e$B$H\e(B Emacs20.2 \e$B$G$O=hM}B.EY$K\e(B
-\e$B05E]E*$J0c$$$,$"$j$^$9!#\e(B
-\e$B2wE,$K;H$&$K$O\e(B Emacs20 \e$B$r$*4+$a$7$^$9\e(B(re-search \e$B$NB.EY$NLdBj$@$H$9$k$H\e(B 
-19.3x \e$B0J>e$+$I$&$+$,6-$K$J$k$G$7$g$&\e(B)\e$B!#\e(B
+\e$B05E]E*$J0c$$$,$"$j$^$9!#2wE,$K;H$&$K$O\e(B Emacs20 \e$B$r$*4+$a$7$^$9\e(B(re-search 
+\e$B$NB.EY$NLdBj$@$H$9$k$H\e(B 19.3x \e$B0J>e$+$I$&$+$,6-$K$J$k$G$7$g$&\e(B)\e$B!#\e(B
 
 \e$B$^$?!"0l$D$N=q8K%U%!%$%k$KB?$/$N%U%!%$%k$,4^$^$l$F$$$k$H%"!<%+%$%P5/F0;~\e(B
 \e$B$N%*!<%P!<%X%C%I$,2CB.EYE*$KA}2C$9$k\e(B(\e$BFC$K\e(B LHA \e$B$N>l9g\e(B)\e$B$?$a!"\e(B150 \e$BDLDxEY!"\e(B
@@ -1205,9 +1186,9 @@ Expire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$$G$7$g$&!#\e(B
 
 @item elmo-archive-@var{type}-method-alist
 @vindex elmo-archive-TYPE-method-alist
-\e$B%"!<%+%$%P$N\e(B @var{type}
-(\e$B<B:]$K$O\e(B @samp{lha}, @samp{zip}, @samp{zoo}, @samp{tgz} \e$B$J$I$NJ8;zNs$,F~$k\e(B)
-\e$BKh$N!"3F<o%a%=%C%I$r5-=R$7$^$9!#\e(Balist \e$B$N3FMWAG$O0J2<$N$h$&$K$J$j$^$9!#\e(B
+\e$B%"!<%+%$%P$N\e(B @var{type} (\e$B<B:]$K$O\e(B @samp{lha}, @samp{zip}, @samp{zoo},
+@samp{tgz} \e$B$J$I$NJ8;zNs$,F~$k\e(B)\e$BKh$N!"3F<o%a%=%C%I$r5-=R$7$^$9!#O"A[%j%9%H\e(B
+\e$B$N3FMWAG$O0J2<$N$h$&$K$J$j$^$9!#\e(B
 
 @example
 @group
@@ -1245,8 +1226,8 @@ Expire \e$B5!G=\e(B (@pxref{Expire}) \e$B$HAH$_9g$o$;$k$H$$$$$G$7$g$&!#\e(B
 
 @item elmo-archive-lha-dos-compatible
 @vindex elmo-archive-lha-dos-compatible
-\e$B$3$NJQ?t$,\e(B non-nil \e$B$G$"$l$P\e(B DOS \e$BHG\e(B(\e$B5H:j;a%*%j%8%J%k\e(B)\e$B$N\e(B LHA \e$B$H%*%W%7%g\e(B
-\e$B%s8_49$H8+Pv$7$^$9!#=i4|CM$G$O\e(B OS/2 \e$B$H\e(B Win32 \e$B$N$_\e(B t \e$B$G$9!#\e(B
+\e$B$3$NJQ?t$,\e(B non-nil \e$B$G$"$l$P\e(B DOS \e$BHG\e(B(\e$B5H:j;a%*%j%8%J%k\e(B)\e$B$N\e(B LHA \e$B$H%*%W%7%g%s\e(B
+\e$B8_49$H8+Pv$7$^$9!#=i4|CM$G$O\e(B OS/2 \e$B$H\e(B Win32 \e$B$N$_\e(B @code{t} \e$B$G$9!#\e(B
 
 @item elmo-archive-cmdstr-max-length
 @vindex elmo-archive-cmdstr-max-length
@@ -1255,6 +1236,7 @@ elmo-archive \e$B$+$i$O\e(B(\e$BI8=`>uBV$G$O\e(B)\e$B%"!<%+%$%P$r%7%'%k$r7PM3$;$:$K5/
 \e$B$N$G!"B?$/$N%Q%i%a!<%?$r0lEY$KM?$($FF0$+$;$k$+$I$&$+$O\e(B OS \e$B%l%Y%k$NLdBj$K\e(B
 \e$B$J$j$^$9!#$3$l$O!"Nc$($P?tI4DLC10L$N%a%C%;!<%8$r0lEY$K>C5n$G$-$k$+$I$&$+\e(B
 \e$B$NLdBj!"$HFI$_BX$($F$/$@$5$$!#\e(B
+
 OS/2 \e$B$G$O%7%'%k$r2p$5$:$KH/9T$G$-$k%3%^%s%IJ8;zNs$O\e(B 8190 \e$B%P%$%H$^$G$J$N\e(B
 \e$B$G!"M>M5$r8+$F%G%U%)%k%H$r\e(B 8000 \e$B$K$7$F$$$^$9!#\e(BOS/2 REXX \e$B$d%7%'%k%9%/%j%W\e(B
 \e$B%H$J$I$r3z$^$9>l9g!"%7%'%k$N<BAu$K0MB8$9$k$3$H$KCm0U$7$F$/$@$5$$!#\e(B
@@ -1304,25 +1286,19 @@ default \e$BCM\e(B:
 
 @example
 @group
-&hoge@@localhost -> localhost \e$B$X%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
-&hoge@@popserver:109 -> \e$B%[%9%H\e(B "popserver" \e$B$N%]!<%H\e(B 109 \e$BHV$X\e(B
-                        \e$B%f!<%6\e(B "hoge" \e$B$G%"%/%;%9!#\e(B
+&hoge@@localhost -> localhost \e$B$X%f!<%6\e(B @samp{hoge} \e$B$G%"%/%;%9!#\e(B
+&hoge@@popserver:109 -> \e$B%[%9%H\e(B @samp{popserver} \e$B$N%]!<%H\e(B 109 \e$BHV$X\e(B
+                        \e$B%f!<%6\e(B @samp{hoge} \e$B$G%"%/%;%9!#\e(B
 @end group
 @end example
 
-APOP \e$B$rMxMQ$9$k$K$O!"\e(B@file{md5.el} \e$B$,I,MW$G$9!#\e(B
-(XEmacs\e$B$G$OI,MW$"$j$^$;$s!#\e(B)
-@file{md5.el} \e$B$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/sasl/lisp/} \e$B$+\e(B
- Emacs/W3 \e$B%Q%C%1!<%8\e(B
-
-@example
-http://www.cs.indiana.edu/elisp/w3/docs.html
-@end example
-
-\e$B$^$?$O!"\e(BLCD archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
+APOP \e$B$rMxMQ$9$k$K$O!"\e(B@file{md5.el} \e$B$,I,MW$G$9!#\e(B(XEmacs\e$B$G$OI,MW$"$j$^$;$s!#\e(B
+) @file{md5.el} \e$B$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/sasl/lisp/} \e$B$+\e(B Emacs/W3 \e$B%Q%C\e(B
+\e$B%1!<%8\e(B (@uref{http://www.cs.indiana.edu/elisp/w3/docs.html})\e$B!"$^$?$O\e(B LCD
+archive \e$B$+$iF~<j2DG=$G$9\e(B(GPL2)\e$B!#\e(B
 
 \e$B%U%)%k%@L>$N:G8e$K\e(B @samp{!} \e$B$,IU$$$F$$$k$H!"\e(BSSL \e$B$rMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#\e(B
-\e$BJQ?t\e(B @code{elmo-default-pop-ssl} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
+\e$BJQ?t\e(B @code{elmo-default-pop3-stream-type} \e$B$NCM$,\e(B non-nil \e$B$J$i!"\e(B@samp{!} \e$B$rIU$1\e(B
 \e$B$J$/$F$b\e(B SSL \e$B$r;H$$$^$9!#\e(B@code{starttls} \e$B$J$i\e(B @samp{!!} \e$B$r0UL#$7$^$9!#\e(B
 (SSL \e$B$rMxMQ$9$k$K$O\e(B \e$BK\%Q%C%1!<%8$N\e(B @file{utils/ssl.el} \e$B$r%$%s%9%H!<%k$9$k\e(B
 \e$BI,MW$,$"$j$^$9!#$J$*$+$D!"\e(BOpenSSL\e$B$K4^$^$l$k\e(B @file{openssl} \e$B$K%Q%9$,DL$C$F$$$k\e(B
@@ -1347,9 +1323,9 @@ STARTTLS \e$B$rMxMQ$9$k$K$O!"$5$i$K!"\e(Bstarttls\e$B%Q%C%1!<%8$r%$%s%9%H!<%k\e(B
 @end group
 @end example
 
-@samp{*} \e$B$N8e$K!"\e(B@samp{@var{\e$B%U%)%k%@\e(B1},@var{\e$B%U%)%k%@\e(B2},@dots{},@var{\e$B%U%)%k%@\e(BN}}
-\e$B$N$h$&$K\e(B @samp{,} (\e$B%3%s%^\e(B)\e$B$G6h@Z$C$F!"0l$D$K8+$($k$h$&$K$7$?$$%U%)%k%@72$r\e(B
-\e$B;XDj$7$^$9!#\e(B
+@samp{*} \e$B$N8e$K!"\e(B@samp{@var{\e$B%U%)%k%@\e(B1},@var{\e$B%U%)%k%@\e(B2},@dots{},@var{\e$B%U%)\e(B
+\e$B%k%@\e(BN}}\e$B$N$h$&$K\e(B @samp{,} (\e$B%3%s%^\e(B)\e$B$G6h@Z$C$F!"0l$D$K8+$($k$h$&$K$7$?$$%U%)\e(B
+\e$B%k%@72$r;XDj$7$^$9!#\e(B
 
 \e$BNc\e(B:
 
@@ -1523,9 +1499,9 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 @samp{|} @var{\e$B<h$j9~$_85\e(B} @samp{|} @var{\e$B<h$j9~$_@h\e(B}
 @end example
 
-\e$B%U%)%k%@1\Mw;~!"\e(B@var{\e$B<h$j9~$_85\e(B}\e$B$+$i\e(B@var{\e$B<h$j9~$_@h\e(B}\e$B$X<+F0E*$K%a%C%;!<%8$,\e(B
-\e$B0\F0$7$^$9!#\e(BPOP \e$B$rMxMQ$7$F%a%C%;!<%8$r%m!<%+%k$K%@%&%s%m!<%I$7$F1\Mw$7$?$$\e(B
-\e$B>l9g$O!"\e(B
+\e$B%U%)%k%@1\Mw;~!"\e(B@var{\e$B<h$j9~$_85\e(B}\e$B$+$i\e(B@var{\e$B<h$j9~$_@h\e(B}\e$B$X<+F0E*$K%a%C%;!<%8\e(B
+\e$B$,0\F0$7$^$9!#\e(BPOP \e$B$rMxMQ$7$F%a%C%;!<%8$r%m!<%+%k$K%@%&%s%m!<%I$7$F1\Mw$7\e(B
+\e$B$?$$>l9g$O!"\e(B
 
 @example
 |&username@@popserver|+inbox
@@ -1533,7 +1509,8 @@ lastyear  ->  \e$B5nG/$N:#F|\e(B
 
 @noindent
 \e$B$N$h$&$K;XDj$9$k$H!"%U%)%k%@$NI=<($r99?7$9$k$H$-$K\e(B
-@samp{&username@@popserver} \e$B$+$i\e(B @samp{+inbox} \e$B$X!"%a%C%;!<%8$,<+F0E*$K<h$j9~$^$l$^$9!#\e(B
+@samp{&username@@popserver} \e$B$+$i\e(B @samp{+inbox} \e$B$X!"%a%C%;!<%8$,<+F0E*$K\e(B
+\e$B<h$j9~$^$l$^$9!#\e(B
 
 \e$BNc\e(B:
 
@@ -1577,6 +1554,9 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 @samp{$}\e$B%^!<%/$,:o=|$5$l$^$9!#$^$?!"$3$N%U%)%k%@$K%a%C%;!<%8$rDI2C$9$k$H!"\e(B
 \e$B$=$N%a%C%;!<%8$K$O\e(B @samp{$} \e$B%^!<%/$,IU$1$i$l$^$9!#\e(B
 
+(\e$B8=:_!"\e(B@samp{'mark} \e$B%U%)%k%@$+$i$O\e(B IMAP \e$B%5!<%P>e$N%^!<%/$r>C$;$^$;$s!#\e(B
+IMAP \e$B%U%)%k%@$GD>@\>C$7$?>l9g$@$1%5!<%P>e$N%^!<%/$,>C$($^$9!#\e(B)
+
 @samp{'cache/00} \e$B!A\e(B @samp{'cache/1F} \e$B$O%M%C%H%o!<%/7PM3$GFI$s$@%a%C%;!<\e(B
 \e$B%8$N%-%c%C%7%e$K%"%/%;%9$9$k$?$a$N%U%)%k%@$G$9!#\e(B00 \e$B!A\e(B 1F \e$B$K$O!"%-%c%C%7%e\e(B
 \e$B%G%#%l%/%H%j\e(B (@file{~/.elmo/cache})\e$B$N%5%V%G%#%l%/%H%jL>$r;XDj$7$^$9!#\e(B
@@ -1681,10 +1661,13 @@ Wanderlust \e$B$NFbIt$GJ];}$5$l$?%a%C%;!<%8$r1\Mw$9$k$?$a$N%U%)%k%@$G$9!#\e(B
 
 @item W
 @kindex W (Folder)
-@findex wl-folder-write-current-newsgroup
-\e$B8=:_%+!<%=%k$,$"$k%U%)%k%@$,\e(B NNTP \e$B%U%)%k%@$J$i!"\e(B
-Newsgroups \e$B%U%#!<%k%I$rJd$C$F%I%i%U%H$rMQ0U$7$^$9!#\e(B
-(@code{wl-folder-write-current-newsgroup})
+@findex wl-folder-write-current-folder
+\e$B8=:_%+!<%=%k$,$"$k%U%)%k%@$,\e(B NNTP \e$B%U%)%k%@$J$i!"\e(B@samp{Newsgroups:} \e$B%U%#!<\e(B
+\e$B%k%I$rJd$C$F%I%i%U%H$rMQ0U$7$^$9!#%a!<%j%s%0%j%9%H$N%j%U%!%$%k@h$J$i!"%a!<\e(B
+\e$B%j%s%0%j%9%H$N%"%I%l%9$r?dB,$7$F!"\e(B@samp{To:} \e$B%U%#!<%k%I$rJd$C$F%I%i%U%H\e(B
+\e$B$rMQ0U$7$^$9!#JQ?t\e(B @code{wl-subscribed-mailing-list} \e$B$r@_Dj$7$F$*$/I,MW\e(B
+\e$B$,$"$j$^$9!#\e(B
+(@code{wl-folder-write-current-folder})
 
 @item C-c C-o
 @kindex C-c C-o (Folder)
@@ -1891,10 +1874,10 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 
 @noindent
 \e$B$H$J$C$F$$$^$9!#\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B non-nil \e$B$N>l9g$O\e(B@var{\e$B%U%)%k%@$N@55,I=\e(B
-\e$B8=\e(B}\e$B$K%^%C%A$7$?%U%)%k%@$N$_I=<($7!"\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B nil \e$B$N>l9g$O\e(B@var{
-\e$B%U%)%k%@$N@55,I=8=\e(B}\e$B$K%^%C%A$7$?%U%)%k%@$OI=<($5$l$J$/$J$j$^$9!#$?$@$7!"\e(B
-@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B non-nil \e$B$G$b4{$K\e(B unsubscribe \e$B$5$l$F$$$k%U%)%k%@$OI=<(\e(B
-\e$B$5$l$^$;$s!#$^$?!"\e(B@var{\e$B%U%)%k%@$N@55,I=8=\e(B}\e$B$OJ#?t8D5-=R$G$-$^$9!#\e(B
+\e$B8=\e(B}\e$B$K%^%C%A$7$?%U%)%k%@$N$_I=<($7!"\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B @code{nil} \e$B$N>l9g\e(B
+\e$B$O\e(B@var{\e$B%U%)%k%@$N@55,I=8=\e(B}\e$B$K%^%C%A$7$?%U%)%k%@$OI=<($5$l$J$/$J$j$^$9!#$?\e(B
+\e$B$@$7!"\e(B@var{\e$B9XFI%U%i%0\e(B}\e$B$,\e(B non-nil \e$B$G$b4{$K\e(B unsubscribe \e$B$5$l$F$$$k%U%)%k%@\e(B
+\e$B$OI=<($5$l$^$;$s!#$^$?!"\e(B@var{\e$B%U%)%k%@$N@55,I=8=\e(B}\e$B$OJ#?t8D5-=R$G$-$^$9!#\e(B
 
 \e$BNc\e(B:
 
@@ -2057,8 +2040,8 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 \e$B$5$i$K!"%"%/%;%9%0%k!<%WFb$G\e(B @code{wl-fldmgr-cut} \e$B$H\e(B 
 @code{wl-fldmgr-cut-region} \e$B$r<B9T$9$k$H!"$=$l$>$l\e(B 
 @code{wl-fldmgr-unsubscribe} \e$B$H\e(B @code{wl-fldmgr-unsubscribe-region} \e$B$r<B\e(B
-\e$B9T$7$?$N$HF1$88z2L$,F@$i$l$^$9!#0c$$$O\e(B cut(-region) \e$B$N>l9g$O2hLL$+$i$b>C\e(B
-\e$B5n$9$k$3$H$G$9!#\e(B
+\e$B9T$7$?$N$HF1$88z2L$,F@$i$l$^$9!#0c$$$O\e(B cut \e$B$N>l9g$O2hLL$+$i$b>C5n$9$k$3\e(B
+\e$B$H$G$9!#\e(B
 
 @subsubsection \e$B%"%/%;%9%0%k!<%WFb$NA`:n\e(B
 
@@ -2328,7 +2311,7 @@ Non-nil \e$B$J$i%a%C%;!<%8$,:o=|$5$l$?$H$-$K%U%)%k%@%b!<%I$GL$FI?t$r%A%'%C%/\e(B
 
 @menu
 * Usage of Summary mode::       \e$B;HMQJ}K!\e(B
-* Thread Oparations::           \e$B%9%l%C%I$NA`:n\e(B
+* Thread Operations::           \e$B%9%l%C%I$NA`:n\e(B
 * Cache::                       \e$B%-%c%C%7%e$H@hFI$_5!G=\e(B
 * Auto Refile::                 \e$B<+F0%j%U%!%$%k\e(B
 * Sticky Summary::              \e$B%9%F%#%C%-!<%5%^%j\e(B
@@ -2337,7 +2320,7 @@ Non-nil \e$B$J$i%a%C%;!<%8$,:o=|$5$l$?$H$-$K%U%)%k%@%b!<%I$GL$FI?t$r%A%'%C%/\e(B
 @end menu
 
 
-@node Usage of Summary mode, Thread Oparations, Summary, Summary
+@node Usage of Summary mode, Thread Operations, Summary, Summary
 @section \e$B;HMQJ}K!\e(B(TIPS)
 
 @subsection \e$B%5%^%j$NI=<(FbMF\e(B
@@ -2432,18 +2415,20 @@ News \e$B%U%)%k%@$G$O\e(B article \e$BHV9f!"\e(BIMAP \e$B%U%)%k%@$G$O\e(B UID\e$B!"\e(BM
 \e$B4{FI%a%C%;!<%8$KIU$-$^$9!#%^!<%/$J$7$H$N0c$$$O!"\e(B@samp{u} \e$B$N%a%C%;!<%8$O\e(B
 \e$B%-%c%C%7%e$5$l$F$$$J$$$3$H$G$9!#\e(B
 @item $
-@kbd{$} \e$B%-!<$r2!$9$H!"\e(B@samp{$} \e$B%^!<%/$,IU$-$^$9!#\e(B
-\e$B$3$N%^!<%/$O\e(BEmacs\e$B$r=*N;$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=EMW$J%a%C%;!<%8$KIU$1$F$*$/$HJXMx$G$9!#\e(B@samp{$} \e$B$NIU$$$?%a%C%;!<%8$O!"%K%e!<%95-;v$d%5!<%P>e$N\e(BIMAP\e$B%U%)%k%@$N%a%C%;!<%8$,\e(B expire \e$B$5$l$k$J$I$7$F>C$($?>l9g$b;D$j$^$9!#\e(B
+@kbd{$} \e$B%-!<$r2!$9$H!"\e(B@samp{$} \e$B%^!<%/$,IU$-$^$9!#$3$N%^!<%/$O\e(BEmacs\e$B$r=*N;\e(B
+\e$B$7$F$bJ]B8$5$l$k$?$a!"$"$H$GJV;v$r=q$-$?$$>l9g$J$I!"3P$($F$*$-$?$$=EMW$J\e(B
+\e$B%a%C%;!<%8$KIU$1$F$*$/$HJXMx$G$9!#\e(B@samp{$} \e$B$NIU$$$?%a%C%;!<%8$O!"%K%e!<\e(B
+\e$B%95-;v$d%5!<%P>e$N\e(B IMAP \e$B%U%)%k%@$N%a%C%;!<%8$,\e(B expire \e$B$5$l$k$J$I$7$F>C$(\e(B
+\e$B$?>l9g$b;D$j$^$9!#\e(B
 @item \e$B$J$7\e(B
 \e$B4{FI%a%C%;!<%8$K$O%^!<%/$,B8:_$7$^$;$s!#\e(B
 @end table
 
-@samp{N}, @samp{U}, @samp{u} \e$B$O!"\e(B
-\e$B$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$J$$$3$H$r$7$a$7$F$$$^$9!#\e(B
-\e$B$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"\e(B
-\e$B$D$^$j!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"\e(B
-\e$B%M%C%H%o!<%/$K@\B3$5$l$F$$$J$/$F$b\e(B IMAP \e$B%U%)%k%@$N%a%C%;!<%8$d\e(B
-NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-$^$9!#\e(B
+@samp{N}, @samp{U}, @samp{u} \e$B$O!"$=$N%a%C%;!<%8$,%-%c%C%7%e$5$l$F$$$J$$\e(B
+\e$B$3$H$r$7$a$7$F$$$^$9!#$3$l$i$N%^!<%/$,IU$$$F$$$J$$>l9g!"$D$^$j!"$=$N%a%C\e(B
+\e$B%;!<%8$,%-%c%C%7%e$5$l$F$$$k>l9g$O!"%M%C%H%o!<%/$K@\B3$5$l$F$$$J$/$F$b\e(B
+IMAP \e$B%U%)%k%@$N%a%C%;!<%8$d\e(B NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-\e(B
+\e$B$^$9!#\e(B
 
 @subsection \e$B%a%C%;!<%8$NFI$_$9$9$a$+$?\e(B
 
@@ -2456,8 +2441,13 @@ NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-$^$9!#\e(B
 \e$B%^%k%A%Q!<%H$NA`:n$O%a%C%;!<%8%P%C%U%!$K0\F0$7$F$+$i9T$$$^$9!#\e(B
 @xref{Message}.
 
+@subsection \e$B%a%C%;!<%8HV9f$r5M$a$k\e(B
+\e$B%5%^%j$G\e(B @kbd{M-x wl-summary-pack-number} \e$B$H$9$k$3$H$G\e(B
+\e$B%a%C%;!<%8HV9f$r5M$a$k$3$H$,$G$-$^$9!#$?$@$7BP1~$7$F$$$k%U%)%k%@$N<oN`$O\e(B
+MH Folder, News Spool Folder, Maildir Folder \e$B$N$_$G$9!#\e(B
 
-@node Thread Oparations, Cache, Usage of Summary mode, Summary
+
+@node Thread Operations, Cache, Usage of Summary mode, Summary
 @section \e$B%9%l%C%I$NA`:n\e(B
 
 \e$BNc$($P!"\e(B
@@ -2481,10 +2471,23 @@ NNTP \e$B%U%)%k%@$N%K%e!<%95-;v$rFI$`$3$H$,$G$-$^$9!#\e(B
 \e$B$b$&0l2s\e(B @kbd{/} \e$B$r2!$9$H!"%9%l%C%I$rJD$8$^$9!#\e(B
 prefix argument \e$B$D$-$G\e(B @kbd{/} \e$B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#\e(B
 
-@kbd{t} \e$B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#\e(B
+@kbd{[} \e$B$G%5%^%j$NA4$F$N%9%l%C%I$r3+$-!"\e(B@kbd{]}\e$B$GA4$F$N%9%l%C%I$rJD$8$^\e(B
+\e$B$9!#\e(B
+
+@kbd{t} \e$B$+$i;O$^$k%3%^%s%I$G!"$=$N%9%l%C%I$KB0$9$k%a%C%;!<%8$KBP$7$F0l3g\e(B
+\e$B$7$F=hM}$r9T$&$3$H$,$G$-$^$9!#\e(B
+@xref{Key Bindings of Summary}.
+
+
+@subsection \e$B%9%l%C%I$N7R$.$J$*$7\e(B
+
+\e$B<jF0$G%9%l%C%I$N7R$.$J$*$7$,$G$-$^$9!#%5%^%j$G3:Ev$9$k%a%C%;!<%8$K%+!<%=\e(B
+\e$B%k$r9g$o$;$F\e(B @kbd{M-w} (@code{wl-summary-save-current-message}) \e$B$7!"?7$7\e(B
+\e$B$$?F%a%C%;!<%8$N$H$3$m$G\e(B @kbd{C-y}
+(@code{wl-summary-yank-saved-message})\e$B$9$k$H%9%l%C%I$,7R$.$J$*$5$l$^$9!#\e(B
 
 
-@node Cache, Auto Refile, Thread Oparations, Summary
+@node Cache, Auto Refile, Thread Operations, Summary
 @section \e$B%-%c%C%7%e\e(B
 
 @subsection \e$B%-%c%C%7%e%U%!%$%k\e(B
@@ -2519,9 +2522,9 @@ The initial setting is the list shown below:
 
 @noindent
 \e$B@hFI$_5!G=$rM-8z$K$9$k%U%)%k%@$r<oJL$N%j%9%H$G;XDj$7$^$9!#=i4|@_Dj$N>l9g!"\e(B
-\e$B$b$7\e(B localdir \e$B$H\e(B imap4 \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B imap4 \e$B$N%a%C\e(B
-\e$B%;!<%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B 
-@code{wl-cache-prefetch-folder-list} \e$B$h$j$bM%@h$5$l$^$9!#\e(B
+\e$B$b$7\e(B localdir \e$B$H\e(B IMAP \e$B%U%)%k%@$,:.:_$7$?%^%k%A%U%)%k%@$G$O\e(B IMAP \e$B$N%a%C%;!<\e(B
+\e$B%8$@$1$,@hFI$_$5$l$^$9!#$3$NJQ?t$O\e(B @code{wl-cache-prefetch-folder-list} 
+\e$B$h$j$bM%@h$5$l$^$9!#\e(B
 
 \e$B$b$7!"\e(Blocaldir \e$B$H\e(B localnews \e$B%U%)%k%@$b@hFI$_$9$k>l9g$O<!$N$h$&$K;XDj$7$^$9!#\e(B
 
@@ -2601,7 +2604,7 @@ The initial setting is the list shown below:
 \e$B%^%C%A$7$?J8;zNsA4BN$r;2>H$7$^$9!#\e(B
 
 @item \@var{N}
-@var{N} \e$BHVL\$N\e(B `\(@dots{}\)' \e$B$K%^%C%A$7$?J8;zNs$r;2>H$7$^$9!#\e(B
+@var{N} \e$BHVL\$N\e(B @samp{\(@dots{}\)} \e$B$K%^%C%A$7$?J8;zNs$r;2>H$7$^$9!#\e(B
 (@var{N} \e$B$O?t;z\e(B)
 @end table
 
@@ -2839,9 +2842,13 @@ prefix argument \e$B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9!
 
 @item W
 @kindex W (Summary)
-@findex wl-draft-write-current-newsgroup
+@findex wl-summary-write-current-folder
 \e$B8=:_$N%5%^%j$,%K%e!<%9%0%k!<%W$N>l9g!"\e(B@samp{Newsgroups:} \e$B%U%#!<%k%I$rJd$C\e(B
-\e$B$F%I%i%U%H$rMQ0U$7$^$9!#\e(B(@code{wl-draft-write-current-newsgroup})
+\e$B$F%I%i%U%H$rMQ0U$7$^$9!#\e(B
+\e$B8=:_$N%5%^%j$,%a!<%j%s%0%j%9%H$N>l9g!"%a!<%j%s%0%j%9%H$N%"%I%l%9$r?dB,$7\e(B
+\e$B$F\e(B @samp{To:} \e$B%U%#!<%k%I$rJd$C$F%I%i%U%H$rMQ0U$7$^$9!#\e(B
+@code{wl-subscribed-mailing-list} \e$B$r@_Dj$7$F$*$/I,MW$,$"$j$^$9!#\e(B
+(@code{wl-summary-write-current-folder})
 
 @item H
 @kindex H (Summary)
@@ -2894,6 +2901,7 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 (setq wl-ps-print-buffer-func 'ps-print-buffer)
 @end lisp
 
+@noindent
 (@code{wl-summary-print-message})
 
 @item q
@@ -3342,6 +3350,20 @@ Wanderlust \e$B$N%5!<%P!&%]!<%HJL$N%*%U%i%$%s\e(B/\e$B%*%s%i%$%s$rJQ99$7$^$9!#\e(B
 \e$B%P%C%U%!$,B8:_$7$F$$$J$$>l9g$O!"%I%i%U%H%U%)%k%@$+$i%U%!%$%k$r\e(B(\e$BB8:_$9$l$P\e(B)
 \e$BFI$_9~$_$^$9!#\e(B
 (@code{wl-jump-to-draft-buffer})
+
+@item M-w
+@kindex M-w (Summary)
+@findex wl-summary-save-current-message
+\e$B%+!<%=%k9T$N%a%C%;!<%8$N%3%T!<!#\e(B
+(@code{wl-summary-save-current-message})
+
+@item C-y
+@kindex C-y (Summary)
+@findex wl-summary-yank-saved-message
+\e$B%+!<%=%k9T$N%a%C%;!<%8$r?F%a%C%;!<%8$H$7$F!"\e(B
+@code{wl-summary-save-current-message} \e$B$GJ]B8$5$l$?%a%C%;!<%8$r\e(B
+\e$B%9%l%C%I$K7R$.$^$9!#\e(B
+(@code{wl-summary-yank-saved-message})
 @end table
 
 
@@ -3487,7 +3509,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @code{wl-summary-jump-to-msg-by-message-id-via-nntp} \e$B$r8F$S!"\e(B
 @code{elmo-default-nntp-server} \e$B$G;XDj$5$l$?%5!<%P$+$i8!:w$7$^$9!#$3$N$H\e(B
 \e$B$-\e(B @code{elmo-default-nntp-user}, @code{elmo-default-nntp-port},
-@code{elmo-default-nntp-ssl} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
+@code{elmo-default-nntp-stream-type} \e$B$G;XDj$7$?>r7o$G%5!<%P$H@\B3$7$^$9!#\e(B
 
 @code{confirm} \e$B$J$i\e(B @code{elmo-default-nntp-*} \e$B$G;XDj$5$l$?%5!<%P$+$i8!\e(B
 \e$B:w$9$k$+!"%5!<%P$r;XDj$9$k$+$r3NG'$7$^$9!#$3$N>l9g!"%5!<%P$N%[%9%HL>!"$b\e(B
@@ -3547,8 +3569,8 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @item wl-fetch-confirm-threshold
 @vindex wl-fetch-confirm-threshold
 \e$B=i4|@_Dj$O\e(B 30000 (bytes)\e$B!#\e(B@code{wl-fetch-confirm-threshold} \e$B$r1[$($k%5%$\e(B
-\e$B%:$N%a%C%;!<%8$rI=<($9$k;~$O!"3NG'$r5a$a$^$9!#\e(Bnil \e$B$K$9$k$H!"3NG'$;$:$KI=\e(B
-\e$B<($7$^$9!#\e(B
+\e$B%:$N%a%C%;!<%8$rI=<($9$k;~$O!"3NG'$r5a$a$^$9!#\e(B@code{nil} \e$B$K$9$k$H!"3NG'\e(B
+\e$B$;$:$KI=<($7$^$9!#\e(B
 
 @item wl-prefetch-threshold
 @vindex wl-prefetch-threshold
@@ -3633,8 +3655,26 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 @table @code
 @item wl-message-window-size
 @vindex wl-message-window-size
-\e$B=i4|@_Dj$O\e(B @code{'(1 . 4)}\e$B!#\e(Bcons \e$B%;%k$G!"\e(Bcar \e$BCM\e(B: cdr \e$BCM$,\e(B
-\e$B%5%^%j$N%&%#%s%I%&I}!'%a%C%;!<%8$N%&%#%s%I%&I}$H$J$j$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{(1 . 4)}\e$B!#\e(Bcons \e$B%;%k$G!"\e(Bcar \e$BCM\e(B: cdr \e$BCM$,%5%^%j$N%&%#%s%I\e(B
+\e$B%&I}!'%a%C%;!<%8$N%&%#%s%I%&I}$H$J$j$^$9!#\e(B
+@item wl-message-ignored-field-list
+@vindex wl-message-ignored-field-list
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+\e$B%a%C%;!<%8%P%C%U%!$KI=<($7$J$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
+\e$B;XDj$7$^$9!#\e(B
+nil \e$B$J$i!"\e(Bmime-view-ignored-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+@item wl-message-visible-field-list
+@vindex wl-message-visible-field-list
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B nil\e$B!#\e(B
+\e$B%a%C%;!<%8%P%C%U%!$KI,$:I=<($7$?$$%X%C%@%U%#!<%k%I$r@55,I=8=$N%j%9%H$G\e(B
+\e$B;XDj$7$^$9!#\e(Bwl-message-ignored-field-list \e$B$h$jM%@h$5$l$^$9!#\e(B
+nil \e$B$J$i!"\e(Bmime-view-visible-field-list \e$B$NCM$,;H$o$l$^$9!#\e(B
+@item wl-message-sort-field-list
+@vindex wl-message-sort-field-list
+(SEMI \e$B$N$_\e(B) \e$B=i4|@_Dj$O\e(B 
+'("Return-Path" "Received" "^To" "^Cc" "Newsgroups" "Subject" "^From")\e$B!#\e(B
+\e$B%a%C%;!<%8%P%C%U%!$KI=<($9$k%X%C%@%U%#!<%k%I$N=gHV$r@55,I=8=$N%j%9%H$G\e(B
+\e$B;XDj$7$^$9!#\e(B
 @end table
 
 
@@ -3729,7 +3769,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 'top:         \e$BK\J8$N@hF,$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'top-file:    \e$BK\J8$N@hF,$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
 'body:        \e$BK\J8$r;XDj$7$?J8;zNs$KCV$-49$($^$9!#\e(B
-              nil \e$B$r;XDj$9$k$HK\J8$NJ8;zNs$r:o=|$7$^$9!#\e(B
+              @code{nil} \e$B$r;XDj$9$k$HK\J8$NJ8;zNs$r:o=|$7$^$9!#\e(B
 'body-file:   \e$BK\J8$r;XDj$7$?%U%!%$%k$NFbMF$GCV$-49$($^$9!#\e(B
 'bottom:      \e$BK\J8$NKvHx$K;XDj$7$?J8;zNs$rA^F~$7$^$9!#\e(B
 'bottom-file: \e$BK\J8$NKvHx$K;XDj$7$?%U%!%$%k$rA^F~$7$^$9!#\e(B
@@ -3752,7 +3792,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 \e$B$+JQ?t!"%5%V4X?t$r;XDj$7!"\e(BField \e$B$r;XDj$7$?>l9g$O$=$N\e(B Field \e$B$rJQ99!"JQ?t\e(B
 \e$B$r;XDj$7$?>l9g$O0l;~E*$K$=$NJQ?tCM$rJQ99$7$^$9!#\e(B
 
-\e$BCM$K$OJ8;zNs$dJQ?t$NB>!"\e(Belisp\e$B<0$,$=$N$^$^5-=R$G$-!"$b$7!"\e(BField \e$B$NCM$,\e(B 
+\e$BCM$K$OJ8;zNs$dJQ?t$NB>!"\e(Belisp\e$B<0$,$=$N$^$^5-=R$G$-!"$b$7!"\e(BField \e$B$NCM$,\e(B
 @code{nil} \e$B$J$i$P$=$N\e(B Field \e$B$r:o=|$7$^$9!#\e(B
 
 \e$B$D$E$$$F!"<!$NNc$r8+$F2<$5$$!#\e(B
@@ -3774,19 +3814,35 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 \e$B%A$9$l$PE,MQ$5$l$k$h$&$K$J$j$^$9!#$?$@$7!"\e(B@code{wl-draft} \e$B$r<B9T$7$?$H$-\e(B
 \e$B$J$IJV?.85$N%P%C%U%!$,$J$$>l9g$OL5;k$5$l$^$9!#\e(B
 
-\e$BCm0UE@$H$7$F$O!"$3$N\e(B @code{wl-draft-config-alist} \e$B$O!"\e(B
-@code{wl-draft-send-and-exit} \e$B$d\e(B @code{wl-draft-send} \e$B$r<B9T$7$?;~$K0lEY\e(B
-\e$B$@$1E,MQ$5$l$k$3$H$G$9!#$=$N$?$a!"Aw?.$r<h$j$d$a$?8e$K:FEY\e(B 
+\e$B2?$bFCJL$J@_Dj$r$7$J$1$l$P!"\e(B@code{wl-draft-config-alist} \e$B$O!"\e(B
+@code{wl-draft-send-and-exit} \e$B$+\e(B @code{wl-draft-send} \e$B$,<B9T$5$l$kD>A0$K\e(B
+\e$B0lEY$@$1E,MQ$5$l$^$9!#Aw?.$r<h$j$d$a$?8e$K:FEY\e(B 
 @code{wl-draft-config-alist} \e$B$rE,MQ$7$?$$>l9g$O!"\e(B@kbd{C-c C-e}
 (@code{wl-draft-config-exec}) \e$B$r<B9T$7$F$/$@$5$$!#\e(B
 
-\e$B$^$?!"%I%i%U%H%P%C%U%!$N:n@.;~$K<+F0E*$K$3$N\e(B 
+@code{wl-draft-send-and-exit}\e$B!"\e(B@code{wl-draft-send} \e$B$N<B9T;~$K<+F0E*$K\e(B 
+@code{wl-draft-config-alist} \e$B$rE,MQ$7$?$/$J$$>l9g$O!"<!$N$h$&$K@_Dj$7$F\e(B
+\e$B2<$5$$!#\e(B
+
+@lisp
+(remove-hook 'wl-draft-send-hook 'wl-draft-config-exec)
+@end lisp
+
+\e$B%I%i%U%H%P%C%U%!$N:n@.;~$K<+F0E*$K\e(B
 @code{wl-draft-config-alist} \e$B$rE,MQ$7$?$$>l9g$O!"<!$N$h$&$K@_Dj$7$^$9!#\e(B
 
 @lisp
 (add-hook 'wl-mail-setup-hook 'wl-draft-config-exec)
 @end lisp
 
+\e$B%5%^%j%b!<%I$+$i\e(B 'E'(@code{wl-summary-reedit})\e$B$r2!$7$F%a!<%k$r\e(B
+\e$BJT=8$9$k;~$K$b<+F0E*$K\e(B @code{wl-draft-config-alist} \e$B$rE,MQ$7$?$$>l9g$O!"\e(B
+\e$B<!$N$h$&$K@_Dj$7$^$9!#\e(B
+
+@lisp
+(add-hook 'wl-draft-reedit-hook 'wl-draft-config-exec)
+@end lisp
+
 @subsection \e$B%F%s%W%l!<%H$NA^F~\e(B
 @cindex Template
 @cindex Apply Template
@@ -3841,6 +3897,7 @@ Non-nil \e$B$J$i\e(B @code{wl-summary-jump-to-msg-by-message-id} \e$B$G!"%a%C%;!<%8
 
 @subsection POP-before-SMTP\e$B$K$h$k%a!<%k$NAw?.\e(B
 @cindex POP-before-SMTP
+@cindex SMTP-after-POP
 
 POP-before-SMTP\e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 \e$B@_Dj$O!"\e(B
@@ -3870,10 +3927,10 @@ POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$BG'>ZJ}<0$G$9!#\e(B
 POP-before-SMTP \e$B$GG'>Z$r9T$J$&$H$-$N\e(BPOP\e$B%]!<%HHV9f$G$9!#\e(B
 \e$B@_Dj$5$l$F$$$J$$>l9g$O\e(B  @code{elmo-default-pop3-port} \e$B$,;H$o$l$^$9!#\e(B
 
-@item wl-pop-before-smtp-ssl
+@item wl-pop-before-smtp-stream-type
 Non-nil \e$B$J$i\e(B SSL \e$B$rMxMQ$7$F\e(B POP\e$B%3%M%/%7%g%s$rD%$j$^$9!#\e(B@code{starttls} 
 \e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#@_Dj$5$l$F$$$J\e(B
-\e$B$$>l9g$O\e(B @code{elmo-default-pop3-ssl} \e$B$,;H$o$l$^$9!#\e(B
+\e$B$$>l9g$O\e(B @code{elmo-default-pop3-stream-type} \e$B$,;H$o$l$^$9!#\e(B
 @end table
 
 POP-before-SMTP\e$BMQ$NJQ?t\e(B (@code{wl-pop-before-smtp-*})\e$B$,@_Dj$5$l$F$$$J$$\e(B
@@ -3997,11 +4054,22 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 @table @code
 @item wl-subscribed-mailing-list
 @vindex wl-subscribed-mailing-list
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#;22C$7$F$$$k%a!<%j%s%0%j%9%H!#JV;v$N%I%i%U%H$rMQ\e(B
-\e$B0U$9$k$H$-$K\e(B @samp{Mail-Followup-To:} \e$B$d\e(B @samp{Cc:} \e$B$K$3$l$i$,4^$^$l$k$H\e(B
-\e$B$-$O<+J,$N%"%I%l%9$r=|$-$^$9!#$^$?!"%j%U%!%$%k@h$r3P$($k$H$-$K$3$l$i$,\e(B 
-@samp{To:} \e$B$+\e(B @samp{Cc:} \e$B$K4^$^$l$k$H$-$K$O!"$=$N%"%I%l%9$G%j%U%!%$%k@h\e(B
-\e$B$r3P$($^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#;22C$7$F$$$k%a!<%j%s%0%j%9%H$N%j%9%H!#JV;v$N%I%i\e(B
+\e$B%U%H$rMQ0U$9$k$H$-$K\e(B @samp{Mail-Followup-To:} \e$B$d\e(B @samp{Cc:} \e$B$K$3$l$i$,4^\e(B
+\e$B$^$l$k$H$-$O<+J,$N%"%I%l%9$r=|$-$^$9!#$^$?!"%j%U%!%$%k@h$r3P$($k$H$-$K$3\e(B
+\e$B$l$i$,\e(B @samp{To:} \e$B$+\e(B @samp{Cc:} \e$B$K4^$^$l$k$H$-$K$O!"$=$N%"%I%l%9$G%j%U%!\e(B
+\e$B%$%k@h$r3P$($^$9!#\e(B
+
+\e$B@_DjNc\e(B:
+
+@lisp
+@group
+(setq wl-subscribed-mailing-list
+      '("wl@@lists.airs.net"
+        "apel-ja@@m17n.org"
+        "emacs-mime-ja@@m17n.org"))
+@end group
+@end lisp
 
 @item wl-insert-mail-followup-to
 @vindex wl-insert-mail-followup-to
@@ -4015,15 +4083,15 @@ Wanderlust \e$B$N%*%U%i%$%s%b!<%I\e(B/\e$B%*%s%i%$%s%b!<%I$r%H%0%k$7$^$9!#\e(B
 
 @item wl-auto-insert-x-face
 @vindex wl-auto-insert-x-face
-\e$B=i4|@_Dj$O\e(B @code{t\e$B!#\e(BNon-nil} \e$B$G$+$D!"%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r\e(B 
-@file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM$G$9\e(B)\e$B$NFbMF$KMQ0U$7$F$*\e(B
-\e$B$/$H!"%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$F\e(B
-\e$BA^F~$5$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s$,!"\e(B@kbd{C-c
-C-a} \e$B$r2!$9$H%X%C%@It$KA^F~$5$l$^$9!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$G$+$D!"%(%s%3!<%I$5$l$?\e(B X-Face \e$BJ8;zNs$r\e(B 
+@file{~/.xface} (\e$BJQ?t\e(B @code{wl-x-face-file} \e$B$NCM\e(B)\e$B$NFbMF$KMQ0U$7$F$*$/$H!"\e(B
+\e$B%I%i%U%H$,=`Hw$5$l$k$H$-$K<+F0E*$K\e(B @samp{X-Face:} \e$B%U%#!<%k%I$H$7$FA^F~$5\e(B
+\e$B$l$^$9!#\e(B@code{nil} \e$B$N>l9g$O<+F0E*$K$OA^F~$5$l$^$;$s$,!"\e(B@kbd{C-c C-a} \e$B$r\e(B
+\e$B2!$9$H%X%C%@It$KA^F~$5$l$^$9!#\e(B
 
 @item wl-insert-message-id
 @vindex wl-insert-message-id
-\e$B=i4|@_Dj$O\e(B t\e$B!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
 Non-nil \e$B$J$i!"Aw?.;~$K\e(B @samp{Message-ID:} \e$B%U%#!<%k%I$r<+F0E*$KA^F~$7$^$9!#\e(B
 
 @item wl-local-domain
@@ -4038,16 +4106,15 @@ Non-nil \e$B$J$i!"Aw?.;~$K\e(B @samp{Message-ID:} \e$B%U%#!<%k%I$r<+F0E*$KA^F~$7$^$
 (@samp{Message-ID:} \e$B$N%I%a%$%s$,$*$+$7$$$H!"%M%C%H%K%e!<%9$G$U$/$mC!$-$K\e(B
 \e$B$"$C$F$7$^$&2DG=@-$,$"$j$^$9!#\e(B)
 
\e$B$^$?!"$3$NCM$,@_Dj$5$l$F$$$k>l9g!"\e(B@code{system-name} \e$B$K$3$NCM$rIU2C$7$?\e(B
+\e$B$^$?!"$3$NCM$,@_Dj$5$l$F$$$k>l9g!"\e(B@code{system-name} \e$B$K$3$NCM$rIU2C$7$?\e(B
 \e$B%[%9%HL>$,\e(B SMTP \e$B$N\e(B HELO \e$B$N0z?t$H$7$FMxMQ$5$l$^$9!#\e(B
 
 @item wl-message-id-domain
 @vindex wl-message-id-domain
-\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-Non-nil \e$B$J$i!"\e(B@samp{Message-ID:} \e$B$N%I%a%$%s%Q!<%H$K;HMQ$5$l$^$9!#%0%m!<\e(B
-\e$B%P%k$J\e(B IP \e$B$r;}$?$J$$>l9g$J$I!"%I%a%$%s%Q!<%H$r7h$a$i$l$J$$>l9g$O!"\e(B
-@code{wl-message-id-domain} \e$B$K0l0U$JJ8;zNs\e(B(\e$BNc$($P!"%a!<%k%"%I%l%9$J$I\e(B)\e$B$r\e(B
-\e$B@_Dj$7$F$/$@$5$$!#\e(B
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(BNon-nil \e$B$J$i!"\e(B@samp{Message-ID:} \e$B$N%I%a%$%s%Q!<%H\e(B
+\e$B$K;HMQ$5$l$^$9!#%0%m!<%P%k$J\e(B IP \e$B%"%I%l%9$r;}$?$J$$>l9g$J$I!"%I%a%$%s%Q!<\e(B
+\e$B%H$r7h$a$i$l$J$$>l9g$O!"\e(B@code{wl-message-id-domain} \e$B$K0l0U$JJ8;zNs\e(B(\e$BNc$(\e(B
+\e$B$P!"%a!<%k%"%I%l%9$J$I\e(B)\e$B$r@_Dj$7$F$/$@$5$$!#\e(B
 
 @item wl-draft-config-alist
 @vindex wl-draft-config-alist
@@ -4154,11 +4221,25 @@ Non-nil \e$B$J$iJV?.%"%I%l%9$N\e(B @samp{To:}, @samp{Cc:} \e$B%U%#!<%k%I$KAj<j$N%U%
 Non-nil \e$B$J$i<+F0E*$KAw?.$7$^$9\e(B (\e$B$$$A$*$&\e(B @code{y-or-n-p} \e$B$G3NG'$7$^$9\e(B)\e$B!#\e(B
 \e$B<jF0$G%-%e!<$rAw?.$9$k$K$O!"%U%)%k%@%b!<%I$G\e(B @kbd{F} \e$B$r2!$7$F$/$@$5$$!#\e(B
 
+@item wl-ignored-forwarded-headers
+@vindex wl-ignored-forwarded-headers
+\e$B=i4|@_Dj$O\e(B @samp{\\(received\\|return-path\\|x-uidl\\)}\e$B!#\e(B
+\e$BE>Aw;~$K:o=|$9$k%X%C%@%U%#!<%k%IL>$r@55,I=8=$G;XDj$7$^$9!#\e(B
+
+@item wl-ignored-resent-headers
+\e$B=i4|@_Dj$O\e(B @samp{\\(return-receipt\\|[bdf]cc\\)}\e$B!#\e(B
+\e$B:FAw;~$K:o=|$9$k%X%C%@%U%#!<%k%IL>$r@55,I=8=$G;XDj$7$^$9!#\e(B
+
 @item wl-draft-always-delete-myself
 @vindex wl-draft-always-delete-myself
 Non-nil \e$B$J$i!"<+J,08$F$N%a!<%k$KJV?.$9$k>l9g!">o$K\e(B @samp{To:},
 @samp{Cc:} \e$B$+$i<+J,$N%a!<%k%"%I%l%9$r:o=|$7$^$9!#\e(B
 
+@item wl-draft-delete-myself-from-bcc-fcc
+@vindex wl-draft-delete-myself-from-bcc-fcc
+Non-nil \e$B$G!"\e(B@samp{To:}, @samp{Cc:} \e$B$,\e(B \e$BJQ?t\e(B @code{wl-subscribed-mailing-list} \e$B$K\e(B
+\e$B4^$^$l$F$$$k>l9g!"\e(B@samp{Bcc:} , @samp{FCC:} \e$B$r$D$1$^$;$s!%\e(B
+
 @item wl-smtp-posting-server
 @vindex wl-smtp-posting-server
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
@@ -4193,20 +4274,20 @@ SMTP\e$B$N%3%M%/%7%g%s$r$I$N$h$&$KD%$k$+$r;XDj$7$^$9!#\e(B
 @item wl-nntp-posting-user
 @vindex wl-nntp-posting-user
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-\e$B%K%e!<%9Ej9F;~$K\e(BAUTHINFO\e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
+\e$B%K%e!<%9Ej9F;~$K\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$&$H$-$N%f!<%6L>$G$9!#\e(B
 @code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-user} \e$B$r;H$$$^$9!#\e(B
-\e$B$=$l$G$b\e(B @code{nil} \e$B$J$i\e(BAUTHINFO\e$B$K$h$kG'>Z$r9T$J$$$^$;$s!#\e(B
+\e$B$=$l$G$b\e(B @code{nil} \e$B$J$i\e(B AUTHINFO \e$B$K$h$kG'>Z$r9T$J$$$^$;$s!#\e(B
 
 @item wl-nntp-posting-port
 @vindex wl-nntp-posting-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 \e$B%K%e!<%9Ej9F;~$N\e(B NNTP \e$B%5!<%P$N%]!<%HHV9f!#\e(B
-nil\e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-server} \e$B$r;H$$$^$9!#\e(B
 
-@item wl-nntp-posting-ssl
-@vindex wl-nntp-posting-ssl
+@item wl-nntp-posting-stream-type
+@vindex wl-nntp-posting-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
-@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-ssl} \e$B$rI>2A$7$^$9!#\e(B
+@code{nil} \e$B$J$i\e(B @code{elmo-default-nntp-stream-type} \e$B$rI>2A$7$^$9!#\e(B
 Non-nil \e$B$J$i%K%e!<%9Ej9F;~$K\e(B SSL \e$B$rMxMQ$7$^$9!#\e(B
 @code{starttls}\e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
@@ -4232,14 +4313,14 @@ POP-before-SMTP\e$B$G\e(BPOP\e$B$r9T$J$&$H$-$NG'>ZJ}<0$G$9!#\e(B
 @vindex wl-pop-before-smtp-port
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP\e$B$G\e(BPOP\e$B$r9T$J$&$H$-$N%]!<%HHV9f$G$9!#\e(B
-nil\e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-port}\e$B$rMxMQ$7$^$9!#\e(B
+@code{nil} \e$B$N$^$^$J$i\e(B @code{elmo-default-pop3-port}\e$B$rMxMQ$7$^$9!#\e(B
 
-@item wl-pop-before-smtp-ssl
-@vindex wl-pop-before-smtp-ssl
+@item wl-pop-before-smtp-stream-type
+@vindex wl-pop-before-smtp-stream-type
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 POP-before-SMTP \e$B$G\e(B SSL\e$B$rMxMQ$9$k$+$I$&$+$r<($9%U%i%0$G$9!#\e(B@code{nil} \e$B$N\e(B
-\e$B$^$^$J$i\e(B @code{elmo-default-pop3-ssl}\e$B$rMxMQ$7$^$9!#\e(B@code{starttls\e$B$J$i\e(B
-STARTTLS} (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
+\e$B$^$^$J$i\e(B @code{elmo-default-pop3-stream-type}\e$B$rMxMQ$7$^$9!#\e(B
+@code{starttls}\e$B$J$i\e(BSTARTTLS (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @item wl-draft-queue-save-variables
 @vindex wl-draft-queue-save-variables
@@ -4260,7 +4341,7 @@ STARTTLS} (RFC2595)\e$B$rMxMQ$7$F%3%M%/%7%g%s$,D%$i$l$^$9!#\e(B
 
 @noindent
 \e$B$?$@$7!"\e(B@file{im-wl.el} \e$B$K$h$kAw?.$G$O!"\e(B
-@file{sendlog} \e$B$K$O=PNO$;$:$K\e(B imput \e$B$N%m%05!G=$K$*$^$+$;$7$^$9!#\e(B
+@file{sendlog} \e$B$K$O=PNO$;$:$K\e(B @command{imput} \e$B$N%m%05!G=$K$*$^$+$;$7$^$9!#\e(B
 
 @item wl-draft-sendlog-max-size
 @vindex wl-draft-sendlog-max-size
@@ -4287,6 +4368,13 @@ Non-nil\e$B$J$i\e(B LDAP \e$B$rMxMQ$7$F%"%I%l%9Jd40$7$^$9!#\e(B
 @vindex wl-ldap-base
 \e$B=i4|@_Dj$O\e(B @samp{c=US}\e$B!#\e(B
 \e$B%"%I%l%9Jd40;~$N\e(B LDAP \e$B8!:w$N3+;OE@\e(B(base)\e$B$r;XDj$7$^$9!#\e(B
+
+@item wl-draft-remove-group-list-contents
+@vindex wl-draft-remove-group-list-contents
+\e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
+Non-nil\e$B$J$i%a!<%kAw?.$N:]$K08@h$+$i\e(B group-list \e$B$NFbMF$r:o=|$7$^$9\e(B
+(group-list \e$B$H$O08@h$K4^$^$l$k\e(B @samp{Group: foo@@gohome.org,
+bar@@gohome.org;}\e$B$N$h$&$J5-=R$r;X$7$^$9\e(B)\e$B!#\e(B
 @end table
 
 
@@ -4692,6 +4780,9 @@ expire \e$B$r<B9T$7$F$b2?$b$7$^$;$s!#$^$?!"\e(B2,3 \e$BHVL\$NMWAG$N$$$:$l$+$,\e(B
 @item @code{remove}
 \e$BB(%a%C%;!<%8$r:o=|$7$^$9!#\e(B
 
+@item @code{hide}
+\e$B%a%C%;!<%8$r%5%^%j$+$i8+$($J$/$7$^$9\e(B(\e$B:o=|$O$5$l$^$;$s\e(B)\e$B!#\e(B
+
 @item @code{trash}
 \e$B%a%C%;!<%8$r\e(B @code{wl-trash-folder} \e$B$K0\F0$7$^$9!#\e(B
 
@@ -5014,7 +5105,6 @@ Non-nil \e$B$K$9$k$H!"\e(B@file{~/.elmo/expired-log}\e$B$K\e(B expire \e$B$N<B9T7k2L$
 @item wl-expire-add-seen-list
 @vindex wl-expire-add-seen-list
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(B
-
 Non-nil \e$B$N>l9g!"\e(Bexpire \e$B$K$h$j%a%C%;!<%8$r%j%U%!%$%k$7$?>l9g!"4{FI>pJs$r\e(B
 \e$B%j%U%!%$%k@h$N%U%)%k%@$KEA$($k$h$&$K$7$^$9!#\e(B
 
@@ -5118,10 +5208,9 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 @end lisp
 
 @noindent
-\e$B%"!<%+%$%V%U%)%k%@$K%3%T!<$9$k=hM}$r9T$&4X?t$r;XDj$7$^$9!#\e(B
-\e$B$3$N4X?t$K$O!"%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N\e(Bmsgdb\e$B>pJs!"\e(B
-\e$B$N\e(B3\e$B$D$N0z?t$,EO$5$l$^$9!#\e(B
-\e$B$b$A$m$s%f!<%6$,FH<+$K:n$C$F;XDj$9$k$3$H$,$G$-$^$9!#\e(B
+\e$B%"!<%+%$%V%U%)%k%@$K%3%T!<$9$k=hM}$r9T$&4X?t$r;XDj$7$^$9!#$3$N4X?t$K$O!"\e(B
+\e$B%U%)%k%@L>!"%U%)%k%@Fb$K$"$k%a%C%;!<%8$N%j%9%H!"%5%^%j$N\e(Bmsgdb\e$B>pJs!"$N\e(B3\e$B$D\e(B
+\e$B$N0z?t$,EO$5$l$^$9!#$b$A$m$s%f!<%6$,FH<+$K:n$C$F;XDj$9$k$3$H$,$G$-$^$9!#\e(B
 @end table
 
 
@@ -5649,9 +5738,8 @@ pop3                    \e$B!_\e(B    \e$B"$\e(B    \e$B"$\e(B    \e$B"$\e(B
 @file{util/im-wl.el} \e$B$r\e(B @code{load-path} \e$B$K$*$$$F0J2<$N$h$&$K@_Dj$9$l$P\e(B 
 OK \e$B$G$9!#\e(B
 
-\e$B%$%s%9%H!<%k;~$K\e(B @code{exec-path} \e$B>e$K\e(B imput \e$B$,$"$l$P!"\e(B@file{im-wl.el}
-\e$B$O%$%s%9%H!<%k$5$l$^$9!#\e(B
-@xref{Install}.
+\e$B%$%s%9%H!<%k;~$K\e(B @code{exec-path} \e$B>e$K\e(B @command{imput} \e$B$,$"$l$P!"\e(B
+@file{im-wl.el}\e$B$O%$%s%9%H!<%k$5$l$^$9!#\e(B@xref{Install}.
 
 @lisp
 @group
@@ -5752,8 +5840,8 @@ x-face-mule 0.19\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 @group
 (setq wl-highlight-x-face-func
       (function
-       (lambda (beg end)
-        (x-face-mule:x-face-decode-message-header))))
+       (lambda (&optional beg end)
+         (x-face-mule:x-face-decode-message-header))))
 (require 'x-face-mule)
 @end group
 @end lisp
@@ -5765,8 +5853,8 @@ x-face-mule 0.20 \e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 @group
 (setq wl-highlight-x-face-func
       (function
-       (lambda (beg end)
-        (x-face-mule-x-face-decode-message-header))))
+       (lambda (&optional beg end)
+         (x-face-mule-x-face-decode-message-header))))
 (require 'x-face-mule)
 @end group
 @end lisp
@@ -5839,13 +5927,12 @@ Non-nil \e$B$J$i%5%^%j$N%O%$%i%$%H$r9T$$$^$9!#\e(B
 
 @item  wl-summary-partial-highlight-above-lines
 @vindex wl-summary-partial-highlight-above-lines
-\e$B=i4|@_Dj$O\e(B 30\e$B!#\e(B
-@code{wl-summary-highlight-partial-threshold}\e$B$r1[$($k9T?t$N%a%C%;!<%8$,\e(B
-\e$B%5%^%j$KB8:_$9$k>l9g!"%P%C%U%!Kv$+$i!"%+!<%=%k9T$h$j$3$NCM$N9T?tJ,$@$1\e(B
-\e$B>e$N%a%C%;!<%8$^$GItJ,E*$J%O%$%i%$%H$,9T$J$o$l$^$9!#\e(B
-(\e$B$3$NCM$r\e(B nil \e$B$K$9$k$H%P%C%U%!Kv$+$i\e(B
- @code{wl-summary-highlight-partial-threshold}\e$B9TJ,$@$1%O%$%i%$%H$5$l$k\e(B
\e$B$h$&$K$J$j$^$9!#\e(B)
+\e$B=i4|@_Dj$O\e(B 30\e$B!#\e(B@code{wl-summary-highlight-partial-threshold} \e$B$r1[$($k9T\e(B
+\e$B?t$N%a%C%;!<%8$,%5%^%j$KB8:_$9$k>l9g!"%P%C%U%!Kv$+$i!"%+!<%=%k9T$h$j$3$N\e(B
+\e$BCM$N9T?tJ,$@$1>e$N%a%C%;!<%8$^$GItJ,E*$J%O%$%i%$%H$,9T$J$o$l$^$9!#\e(B(\e$B$3$N\e(B
+\e$BCM$r\e(B @code{nil} \e$B$K$9$k$H%P%C%U%!Kv$+$i\e(B
+@code{wl-summary-highlight-partial-threshold}\e$B9TJ,$@$1%O%$%i%$%H$5$l$k$h\e(B
+\e$B$&$K$J$j$^$9!#\e(B)
 
 @item wl-highlight-body-too
 @vindex  wl-highlight-body-too
@@ -5867,19 +5954,25 @@ Non-nil \e$B$J$i%I%i%U%H$*$h$S%a%C%;!<%8$NK\J8$b%O%$%i%$%H$NBP>]$H$7$^$9!#\e(B
 \e$B$3$N@55,I=8=$K%^%C%A$7$?K\J8$O!"\e(B
 (@code{wl-highlight-message-cited-text-*})\e$B$G;XDj$5$l$k\e(Bface\e$B$G%O%$%i%$%H$5$l$^$9!#\e(B
 
-@item  wl-highlight-highlight-citation-too
+@item wl-highlight-highlight-citation-too
 @vindex wl-highlight-highlight-citation-too
 \e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
 Non-nil \e$B$J$i\e(B@code{wl-highlight-citation-prefix-regexp}\e$B$GM?$($i$l$k\e(B
 \e$B0zMQ9T$N0zMQ$r<($9@55,I=8=<+BN$b%O%$%i%$%H$NBP>]$H$7$^$9!#\e(B
 
-@item  wl-highlight-citation-header-regexp
+@item wl-highlight-citation-header-regexp
 @vindex wl-highlight-citation-header-regexp
 \e$B0zMQ$r;O$a$k$3$H$r<($9%X%C%@$N@55,I=8=$r;XDj$7$^$9!#\e(B
 \e$B$3$N@55,I=8=$K%^%C%A$7$?K\J8$O!"\e(B
 @code{wl-highlight-message-headers}\e$B$G;XDj$5$l$k\e(B face \e$B$G%O%$%i%$%H$5$l$^$9!#\e(B
 
-@item  wl-highlight-max-message-size
+@item wl-highlight-max-header-size
+@vindex wl-highlight-max-header-size
+\e$B=i4|@_Dj$O\e(B @code{nil}\e$B!#\e(B
+\e$B%a%C%;!<%8$N%X%C%@%5%$%:$,$3$NCM$h$jBg$-$$>l9g!"%X%C%@$r%O%$%i%$%H$7$^$;\e(B
+\e$B$s!#\e(B@code{nil} \e$B$N>l9g!"%5%$%:$K4X78$J$/%O%$%i%$%H$7$^$9!#\e(B
+
+@item wl-highlight-max-message-size
 @vindex wl-highlight-max-message-size
 \e$B=i4|@_Dj$O\e(B 10000\e$B!#\e(B
 \e$B%a%C%;!<%8$,$3$NCM$h$jBg$-$$>l9g!"%a%C%;!<%8$N%O%$%i%$%H$r9T$$$^$;$s!#\e(B
@@ -5942,24 +6035,24 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$JItJ,$N\e(B face \e$B$=$N#2$G$9!#\e(B
 \e$B%G%U%)%k%H$G$O!"\e(B@samp{From:} \e$B$H\e(B @samp{To:} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
 \e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
\e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
+\e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
 @item wl-highlight-message-unimportant-header-contents
 \e$B%a%C%;!<%8%X%C%@$NFbMF$N$&$A=EMW$G$O$J$$ItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B%G%U%)%k%H$G$O!"\e(B@samp{X-} \e$B$G;O$^$k%X%C%@$H\e(B @samp{User-Agent:} \e$B$NFbMFItJ,$,@_Dj$5$l$F$$$^$9!#\e(B
-\e$B$3$NCM$O\e(B @code{wl-highlight-message-header-alist}
\e$B$rJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
+\e$B%G%U%)%k%H$G$O!"\e(B@samp{X-} \e$B$G;O$^$k%X%C%@$H\e(B @samp{User-Agent:} \e$B$NFbMFItJ,\e(B
+\e$B$,@_Dj$5$l$F$$$^$9!#$3$NCM$O\e(B @code{wl-highlight-message-header-alist} \e$B$r\e(B
+\e$BJQ99$9$l$PJQ$($k$3$H$,$G$-$^$9!#\e(B
 
 @item wl-highlight-message-citation-header
 \e$B%a%C%;!<%8$N0zMQ%X%C%@ItJ,$N\e(B face \e$B$G$9!#\e(B
 
 @item wl-highlight-message-cited-text-*
 \e$B%a%C%;!<%8$N0zMQ%F%-%9%HItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B:G8e$K$O?t;z$,$D$-!"\e(B10 \e$BCJ3,$^$G0zMQ$4$H$K?'J,$1$G$-$k$h$&$K$7$F$$$^$9!#\e(B
+\e$B:G8e$K$O\e(B@var{\e$B?t;z\e(B}\e$B$,$D$-!"\e(B10 \e$BCJ3,$^$G0zMQ$4$H$K?'J,$1$G$-$k$h$&$K$7$F$$$^$9!#\e(B
 
 @item wl-highlight-message-signature
-\e$B%a%C%;!<%8$N%7%0%K%A%cItJ,$N\e(B face \e$B$G$9!#\e(B
-\e$B=i4|@_Dj$O!"L@?'%P%C%/$G$O\e(B khaki \e$B0E?'%P%C%/$G$O\e(B DarkSlateBule \e$B$G$9!#\e(B
+\e$B%a%C%;!<%8$N%7%0%K%A%cItJ,$N\e(B face \e$B$G$9!#=i4|@_Dj$O!"L@?'%P%C%/$G$O\e(B 
+@samp{khaki}\e$B!"0E?'%P%C%/$G$O\e(B @samp{DarkSlateBule} \e$B$G$9!#\e(B
 
 @item wl-highlight-header-separator-face
 \e$B%I%i%U%H$N%a%C%;!<%8$N%X%C%@%;%Q%l!<%?$N\e(B face \e$B$G$9!#\e(B
@@ -6026,12 +6119,12 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @item wl-highlight-folder-opened-face
 \e$B%U%)%k%@%b!<%I$G!"3+$$$?%0%k!<%W$K$D$/\e(B face \e$B$G$9!#\e(B
-\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @dfn{\e$B?t\e(B} \e$B$N\e(B
+\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @var{\e$B?t\e(B} \e$B$N\e(B
 \e$B$H$-M-8z$G$9!#\e(B
 
 @item wl-highlight-folder-closed-face
 \e$B%U%)%k%@%b!<%I$G!"JD$8$?%0%k!<%W$K$D$/\e(B face \e$B$G$9!#\e(B
-\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @dfn{\e$B?t\e(B} \e$B$N\e(B
+\e$BJQ?t\e(B @code{wl-highlight-folder-by-numbers} \e$B$,\e(B @code{nil} \e$B$+\e(B @var{\e$B?t\e(B} \e$B$N\e(B
 \e$B$H$-M-8z$G$9!#\e(B
 
 @item wl-highlight-folder-path-face
@@ -6047,6 +6140,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @node Biff, Advanced Settings, Highlights, Customization
 @section \e$B%a!<%k$NCe?.$rCN$i$;$k\e(B
+@cindex Biff
 
 \e$B0J2<$N$h$&$K@_Dj$7$F$*$/$H\e(B @samp{%inbox} \e$B$K%a!<%k$,FO$$$?$H$-$K!"\e(B
 \e$B%b!<%I%i%$%s$NI=<($K$h$j%a!<%k$NCe?.$rCN$i$;$F$/$l$^$9!#\e(B
@@ -6066,7 +6160,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @item wl-biff-check-interval
 @vindex wl-biff-check-interval
-\e$B=i4|@_Dj$O\e(B 40\e$B!JC10L!'IC!K!#\e(B
+\e$B=i4|@_Dj$O\e(B 40 (\e$BC10L\e(B:\e$BIC\e(B)\e$B!#\e(B
 \e$B$3$NCM$4$H$K%a!<%kCe?.$N%A%'%C%/$r9T$J$$$^$9!#\e(B
 @end table
 
@@ -6083,6 +6177,10 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @node Draft for Reply, Thread Format, Advanced Settings, Advanced Settings
 @subsection \e$BJV;vMQ%I%i%U%H\e(B
+@vindex wl-draft-reply-with-argument-list
+@vindex wl-draft-reply-without-argument-list
+@vindex wl-draft-reply-myself-with-argument-list
+@vindex wl-draft-reply-myself-without-argument-list
 
 \e$B%a!<%j%s%0%j%9%H$N5-;v$KJV;v$r=q$/$H$-$O!"%5%^%j%b!<%I$G\e(B @kbd{a} \e$B$r2!$7\e(B
 \e$B$?$@$1$G855-;v$N\e(B @samp{Reply-To:} \e$B$K$"$k%"%I%l%9$r\e(B @samp{To:} \e$B$KMQ0U$7$F\e(B
@@ -6099,8 +6197,9 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @end lisp
 
 @noindent
-(@samp{X-ML-Name:} \e$B%U%#!<%k%I5Z$S\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$NN>J}$,855-;v$K\e(B
-\e$BB8:_$9$k>l9g$@$1!"\e(B@samp{To:} \e$B$K855-;vCf$N\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$,=`Hw$5$l$^$9!#\e(B)
+(@samp{X-ML-Name:} \e$B%U%#!<%k%I5Z$S\e(B @samp{Reply-To:} \e$B%U%#!<%k%I$NN>J}$,85\e(B
+\e$B5-;v$KB8:_$9$k>l9g$@$1!"\e(B@samp{To:} \e$B$K855-;vCf$N\e(B @samp{Reply-To:} \e$B%U%#!<\e(B
+\e$B%k%I$,=`Hw$5$l$^$9!#\e(B)
 
 @c (\e$B:G8e$N9T$N0UL#$O!"%I%i%U%H$N\e(B @samp{To:} \e$B$K855-;vCf$N\e(B @samp{From:} \e$B%U%#!<\e(B
 @c \e$B%k%I$,!"%I%i%U%H$N\e(B @samp{Cc:} \e$B$K855-;v$N\e(B @samp{To:} \e$B%U%#!<%k%I$*$h$S\e(B 
@@ -6111,6 +6210,11 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 \e$BF1MM$K$7$F!"\e(Bprefix argument \e$BIU$-$G\e(B  @kbd{a} \e$B$r2!$7$?$H$-$NF0:n$,!"\e(B
 @code{wl-draft-reply-with-argument-list} \e$B$G@_Dj$G$-$^$9!#\e(B
 
+\e$BCm!'\e(B \e$B<+J,$,=P$7$?%a!<%k$KJV?.$9$k:]$NF0:n$O!"$=$l$i$KBe$o$C$F\e(B
+@code{wl-draft-reply-myself-without-argument-list},
+@code{wl-draft-reply-myself-with-argument-list}
+\e$B$G;XDj$7$^$9!#\e(B
+
 
 @node Thread Format, User-Agent Field, Draft for Reply, Advanced Settings
 @subsection \e$B%9%l%C%I$N8+$?$a\e(B
@@ -6161,9 +6265,11 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @node User-Agent Field,  , Thread Format, Advanced Settings
 @subsection User-Agent \e$B%U%#!<%k%I\e(B
+@cindex X-Mailer
+@cindex User-Agent
 
 @samp{X-Mailer:} \e$B%U%#!<%k%I$d\e(B @samp{User-Agent:} \e$B%U%#!<%k%I$K6E$j$?$$$H\e(B
-\e$B$$$&JQ$o$C$??M$O!"E,Ev$KJ8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F\e(B
+\e$B$$$&JQ$o$C$??M$O!"J8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F!"JQ?t\e(B 
 @code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @samp{User-Agent:} \e$B%U%#!<%k%I$rC;$/$7$?$$$N$G$"$l$P!"0J2<$N@_Dj$r$7$F$/\e(B
@@ -6174,8 +6280,8 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
-         (let ((mime-edit-insert-user-agent-field nil))
-           (wl-generate-user-agent-string)))))
+         (concat "User-Agent: "
+                 (wl-generate-user-agent-string-1 nil)))))
 @end group
 @end lisp
 
@@ -6183,6 +6289,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @lisp
 @group
+(setq mime-edit-insert-user-agent-field nil)
 (setq wl-generate-mailer-string-func
       (function
        (lambda ()
@@ -6224,7 +6331,7 @@ Non-nil \e$B$J$i$P!"%a!<%kAw?.;~$KK\Ev$KAw?.$7$F$h$$$+$r3NG'$7$^$9!#\e(B
 
 @item wl-folder-sync-range-alist
 @vindex wl-folder-sync-range-alist
-\e$B=i4|@_Dj$O!"0J2<$NCM!#\e(B
+\e$B=i4|@_Dj$O!"0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6328,7 +6435,7 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 
 @item wl-folder-mime-charset-alist
 @vindex wl-folder-mime-charset-alist
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
+\e$B=i4|@_Dj$O0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6359,7 +6466,7 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 
 @item wl-delete-folder-alist
 @vindex wl-delete-folder-alist
-\e$B=i4|@_Dj$O0J2<$N%j%9%H!#\e(B
+\e$B=i4|@_Dj$O0J2<$NO"A[%j%9%H!#\e(B
 
 @lisp
 @group
@@ -6373,9 +6480,9 @@ Non-nil \e$B$J$i$P!"@_Dj$5$l$?CM$r;}$D%U%)%k%@$NL$FI?t$r5/F0;~$K%A%'%C%/$7$^$9!#\e
 \e$B$-$^$9!#\e(B
 
 @example
-'remove or 'null : \e$B%a%C%;!<%8$rB(:o=|$9$k!#\e(B
-string           : \e$B;XDj$7$?%U%)%k%@$K0\F0$9$k!#\e(B
-'trash or \e$B$=$NB>\e(B : `wl-trash-folder'\e$B$K0\F0$9$k!#\e(B
+@code{remove} or @code{null} : \e$B%a%C%;!<%8$rB(:o=|$9$k!#\e(B
+string             : \e$B;XDj$7$?%U%)%k%@$K0\F0$9$k!#\e(B
+@code{trash} or \e$B$=$NB>\e(B  : @code{wl-trash-folder} \e$B$K0\F0$9$k!#\e(B
 @end example
 
 @item wl-refile-policy-alist
@@ -6463,8 +6570,8 @@ Non-nil \e$B$J$i$P%*%U%i%$%s=hM}$GN/$C$?=hM}$r<B9T$9$k$+$I$&$+$r3NG'$7$^$9!#\e(B
 @item elmo-display-progress-threshold
 @vindex elmo-display-progress-threshold
 \e$B=i4|@_Dj$O\e(B 20\e$B!#\e(B
-\e$B?JD=I=<(\e(B(progress gauge)\e$B$rI=<($9$k$7$-$$CM!#$3$NCM$h$j$b99?7?t$,Bg$-$$>l\e(B
-\e$B9g$O?JD=I=<($7$^$9!#\e(B
+\e$B?JD=I=<(\e(B(progress gauge)\e$B$rI=<($9$kogCM!#$3$NCM$h$j$b99?7?t$,Bg$-$$>l9g$O\e(B
+\e$B?JD=I=<($7$^$9!#\e(B
 @end table
 
 
@@ -6495,16 +6602,15 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
 @noindent
 \e$B$H=q$$$?%a!<%k$rAw$k$HF~2q$N%,%$%I$,<+F0E*$K$b$i$($^$9!#\e(B
 
-\e$B%P%0Js9p$d%Q%C%A$NAwIU$b$3$A$i$N%a!<%j%s%0%j%9%H$XAw$C$F$/$@$5$$!#\e(B
-\e$B%a!<%j%s%0%j%9%H$N%a%s%P$G$J$/$H$b!"Aw?.$G$-$k@_Dj$K$J$C$F$$$^$9!#\e(B
+\e$B%P%0Js9p$d%Q%C%A$NAwIU$b$3$A$i$N%a!<%j%s%0%j%9%H$XAw$C$F$/$@$5$$!#%a!<%j\e(B
+\e$B%s%0%j%9%H$N%a%s%P$G$J$/$H$b!"Aw?.$G$-$k@_Dj$K$J$C$F$$$^$9!#\e(B
 
-\e$B$^$?!"%P%0Js9p$N>l9g$O\e(B Backtrace \e$B$r<h$C$FE:IU$9$k$H$h$j860x5fL@\e(B
-\e$B$7$d$9$/$J$j$^$9!#\e(B 
-@footnote{Backtrace \e$B$N<h$jJ}$O\e(B@uref{http://www.jpl.org/elips/BUGS-ja.html}\e$B$,;29M$K$J$j$^$9!#\e(B}
+\e$B$^$?!"%P%0Js9p$N>l9g$O%P%C%/%H%l!<%9$r<h$C$FE:IU$9$k$H860x5fL@$7$d$9$/$J\e(B
+\e$B$j$^$9!#\e(B @footnote{\e$B%P%C%/%H%l!<%9$N<h$jJ}$O\e(B
+@uref{http://www.jpl.org/elips/BUGS-ja.html}\e$B$,;29M$K$J$j$^$9!#\e(B}
 
-\e$B%a!<%j%s%0%j%9%H$N3'MM$K$O5.=E$J8f=u8@!"\e(B
-\e$B%3!<%I$r$?$/$5$s8fDs6!$$$?$@$$$F$*$j$^$9!#\e(B
-\e$B$3$N>l$r<Z$j$F$*Ni?=$7>e$2$^$9!#\e(B
+\e$B%a!<%j%s%0%j%9%H$N3'MM$K$O5.=E$J8f=u8@!"%3!<%I$r$?$/$5$s8fDs6!$$$?$@$$$F\e(B
+\e$B$*$j$^$9!#$3$N>l$r<Z$j$F$*Ni?=$7>e$2$^$9!#\e(B
 
 
 @node Addition, Index, Mailing List, Top
@@ -6546,6 +6652,8 @@ Wanderlust \e$B$K4X$9$k5DO@$O$3$N%a!<%j%s%0%j%9%H$G9T$o$l$^$9!#\e(B
       7/11    killed message \e$B5!G=DI2C!#\e(B
       7/18    POP3 \e$B$r\e(B UIDL \e$BBP1~!#\e(B
       9/12    biff \e$B5!G=\e(B with \e$B:72eED$5$s!u;32,$5$s!#\e(B
+     10/17    expire-hide by \e$B2,ED$5$s!#\e(B
+     11/08    2.4.0 stable \e$B%j%j!<%9!#\e(B
 @end example
 
 \e$B$/$o$7$$JQA+$O\e(B @file{ChangeLog} \e$B$r8fMw$/$@$5$$!#\e(B
@@ -6574,8 +6682,9 @@ elmo \e$B$O!"\e(B@samp{Elisp Library for Message Orchestration} \e$B$NN,$G$9!#\e(B
 \e$B3F%P!<%8%g%s$K$O%3!<%I%M!<%`$,$D$$$F$$$^$9\e(B(\e$B$[$H$s$I>iCL$G$9\e(B)\e$B!#\e(B
 \e$B$$$^$N$H$3$m\e(B 1980 \e$BG/Be$NJF%S%k%\!<%I;o%H%C%W\e(B 40 \e$B%R%C%H\e(B
 
-(@uref{http://www.summer.com.br/~pfilho/html/top40/index.html})
+(@uref{http://lyrics.natalnet.com.br/html/top40/index.html})
 
+@noindent
 \e$B$+$i%"%k%U%!%Y%C%H=g$KE,Ev$K9%$-$J$b$N$r%T%C%/%"%C%W$7$F;H$C$F$$$^$9!#\e(B