diff --git a/NEWS b/NEWS
index 13ae1a2b..edbf3a19 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
+2008-
+ * version 0.2
+ * ctrl-s mappings to move messages to an "Archive" folder (inspired by gmail)
+ * new :moveto and :copyto commands
+
2008-04-29:
* version 0.1
* first public release, straight port from vimperator with many basic mappings
diff --git a/TODO b/TODO
index 309dcc36..68aec48f 100644
--- a/TODO
+++ b/TODO
@@ -3,52 +3,9 @@ Priority list:
1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
BUGS:
-- add window resize support to hints
-- can't reverse tab through the vimperator toolbar
-- gu and gU doesn't work on Windows.
-- pvh option not working
-- searching backwards incrementally does not work i.e. with 'incsearch' set
-- http://msdn2.microsoft.com/en-us/library/ms535258.aspx does not scroll with j/k/etc.
- same for http://forum.mootools.net/topic.php?id=3458
-- insert abbreviations broken on
FEATURES:
-8 middleclick in content == p, and if command line is open, paste there the clipboard buffer
-8 add more autocommands (BrowserStart, BrowserQuit, TabClose, TabOpen, TabChanged, LocationChanged, any more?)
-8 ;? will show information about like id, class, image filename, etc.
-8 there should be a listbox/combobox mode
-8 y and Y should be changed to: yy and yl=yank location, ys=yank selection,
- yd=yank domain name, yt=yank title, yw=yank current word,
- yS=yank selection, if no selection then yank current word (other things to yank?)
-8 all search commands should start searching from the top of the visible viewport
-7 use ctrl-n/p in insert mode for word completion
-7 implement LocationList window, and get rid off/change PreviewWindow to be a real preview window being able to display html pages
-7 [ctrl-o/i] to Go back to a Previous Position (done partly, however currenty does not use a per tab jumplist)
-7 whereever possible: get rid of dialogs and ask console-like dialog questions or write error prompts directly on the webpage or with :echo()
-7 [d could go to the last domain in the history stack. so if i browse from
- google to another page and click 10 links there, [d would take me back to the google page
- opera's fast forward does something like this
-6 :sidebar improvements (:sidebar! Downloads while downloads is open should refocus the sidebar)
-6 jump to the next heading with ]h, next image ]i, previous textbox [t and so on
-6 :grep support (needs location list)
-6 use '' to jump between marks like vim
-6 pipe selected text/link/website to an external command
-6 :set wildoptions=auto mode, which would list completions on each keystroke (maybe performance problems)
-6 Use ctrl-w+j/k/w to switch between sidebar, content, preview window
-5 Favicons in completion windows and some other places?
-5 make a command to search within google search results
- (http://gadelkareem.com/2007/01/28/using-google-ajax-api-as-an-array/)
- maybe impossible, needs a per-site key from google
-4 Add -nargs, -complete, etc. to :command
-4 } { should jump to the next paragraph of the page (maybe impossible)
-3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
- have a look into the split browser extension
-- many other ideas are listed in the wiki
-
-RANDOM IDEAS:
-* numbered tabs
-* Would it be possible to add a setting "maxcompletionsshown" and
- "maxpreviewwindowheight" or something like this?
-* hide scrollbars: (window.content.document.body.style.overflow = "hidden" has problems with the mouse wheel)
+9 edit messages with vim
+8 */# support
diff --git a/locale/en-US/asciidoc.conf b/locale/en-US/asciidoc.conf
index d60e7dc1..83cda711 100644
--- a/locale/en-US/asciidoc.conf
+++ b/locale/en-US/asciidoc.conf
@@ -20,7 +20,7 @@ email=stubenschrott@gmx.net
#
[replacements]
-LOGO=image:chrome://vimperator/content/logo_white.png[Vimperator]
+LOGO=image:chrome://muttator/content/muttator.png[Muttator]
HEADER=image:chrome://vimperator/content/logo_white.png[Vimperator]
\[count\]=[count]
\[arg\]=[arg]
@@ -49,7 +49,7 @@ HEADER=