Merge muttator

Conflicts:

	muttator/Makefile
	muttator/chrome.manifest

13 files changed, 850 insertions, 22 deletions

diff --git a/muttator/AUTHORS b/muttator/AUTHORS
new file mode 100644
index 00000000..08aa9a66
--- /dev/null
+++ b/muttator/AUTHORS
@@ -0,0 +1,10 @@
+<pre>
+Main developer/Project founder:
+  * Martin Stubenschrott (stubenschrott@gmx.net)
+
+Patches:
+  * Christian Dietrich (too many to list)
+
+A lot of people contributed to Vimperator, which is the basis of Muttator, so please refer
+to that AUTHOR file for more contributors.
+</pre>
diff --git a/muttator/Donators b/muttator/Donators
new file mode 100644
index 00000000..a4ca7399
--- /dev/null
+++ b/muttator/Donators
@@ -0,0 +1,8 @@
+<pre>
+<b>Note:</b> If you don't wish to appear on this list when making a donation, please tell me.
+
+2008:
+* YOU
+
+I want to say a big <b>THANK YOU</b> to all people which supported this project in this way.
+</pre>
diff --git a/muttator/License.txt b/muttator/License.txt
new file mode 100644
index 00000000..cd24cb86
--- /dev/null
+++ b/muttator/License.txt
@@ -0,0 +1,25 @@
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
diff --git a/muttator/Makefile b/muttator/Makefile
index c9631584..49d5dd5c 100644
--- a/muttator/Makefile
+++ b/muttator/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 2.0pre
-NAME          = vimperator
+VERSION       = 0.5pre
+NAME          = muttator
 
 include ../liberator/Makefile.common
diff --git a/muttator/NEWS b/muttator/NEWS
new file mode 100644
index 00000000..0a5d9185
--- /dev/null
+++ b/muttator/NEWS
@@ -0,0 +1,51 @@
+<pre>
+2008-08-xx:
+    * version 0.5
+    * new "threads" option (non-functional for now)
+
+2008-08-03:
+    * version 0.4
+    * new 'autoexternal' option to edit new messages/reply with the external editor by default
+      NOTE: You must set this option in your .muttatorrc, as options are not shared between the
+      main thunderbird window and the compose window!
+    * various "l" mappings for labeling messages
+    * "p" to open RSS message in browser
+    * "y" to yank sender or RSS URL
+    * "Y" to yank subject
+    * "R" to reply to all
+    * new compose mappings: s, t and i: Focus subject:, To: or message body
+    * q quits composer now
+    * new "x" mapping to toggle HTML display (is there a need for "simple HTML"?)
+    * new "h" mapping to toggle headers
+
+2008-06-04:
+    * version 0.3
+    * new tab related mappings + commands
+    * new :contacts and :contact commands for address book operations
+    * new :message command
+    * new -- COMPOSE -- mode with mutt-like keybindings (y to send message, e to edit message)
+    * external editor support for sending messages
+    * m to open a new message compose window
+    * new M command to send a new message to the sender of the currently selected message
+    * completions for :{go,copy,move}to commands
+    * :emptytrash command
+    * new * and # mappings to select next/prev message from same author (not perfect matching however)
+    * J, K, ]s, etc. search in closed threads now
+    * gj and gk to select messages in closed threads
+    * "t" to select current thread, use "lr" now to label a message as read
+    * KMail-like mode-independent scrolling with left/right and up/down
+    * many small improvements
+
+2008-04-30:
+    * version 0.2
+    * ctrl-s mappings to move messages to an "Archive" folder (inspired by gmail)
+    * new :moveto and :copyto commands
+    * u and ctrl-r mappings to undo/redo
+    * new muttator specific :help screen
+    * small bug fixes
+
+2008-04-29:
+    * version 0.1
+    * first public release, straight port from vimperator with many basic mappings
+</pre>
+<!-- vim: set sw=4 ts=4 et: -->
diff --git a/muttator/README b/muttator/README
new file mode 100644
index 00000000..c1705b48
--- /dev/null
+++ b/muttator/README
@@ -0,0 +1,11 @@
+In order to build muttator, you also need to checkout vimperator from:
+http://vimperator.mozdev.org.
+
+And symlink the following files:
+
+cd muttator/src
+ln -s ../../vimperator/src/Makefile.common .
+ln -s ../../vimperator/src/content .
+
+If you want to check-in changes, don't forget to also commit the vimperator part
+inside the local vimperator/ directory.
diff --git a/muttator/TODO b/muttator/TODO
new file mode 100644
index 00000000..66b9bf35
--- /dev/null
+++ b/muttator/TODO
@@ -0,0 +1,11 @@
+<pre>
+Priority list:
+1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
+
+BUGS:
+
+FEATURES:
+9 edit messages with vim
+7 :set! mailnews.wraplength=140 or similar
+
+</pre>
diff --git a/muttator/chrome.manifest b/muttator/chrome.manifest
index e9f7ff8f..b3d4a238 100644
--- a/muttator/chrome.manifest
+++ b/muttator/chrome.manifest
@@ -1,31 +1,18 @@
 # Thunderbird
-content	 muttator        content/
-locale	 liberator en-US locale/en-US/
+content  muttator content/
+locale   liberator en-US locale/en-US/
 
 content	 liberator             ../liberator/content/
 resource liberator             ../liberator/modules/
 skin	 liberator classic/1.0 ../liberator/skin/
 
-override chrome://liberator/content/liberator.dtd chrome://muttator/content/liberator.dtd
-override chrome://liberator/content/config.js	  chrome://muttator/content/config.js
-
-overlay  chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul
-overlay  chrome://browser/content/browser.xul chrome://vimperator/content/vimperator.xul
-
-# Thunderbird
-content  liberator content/
-resource liberator modules/
-locale   liberator en-US locale/en-US/
-skin     liberator classic/1.0 skin/
-
-override chrome://liberator/content/liberator.dtd chrome://liberator/content/muttator.dtd
-override chrome://liberator/content/config.js chrome://liberator/content/muttator.js
+override chrome://liberator/content/liberator.dtd chrome://muttator/content/muttator.dtd
+override chrome://liberator/content/config.js chrome://muttator/content/muttator.js
 
 overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/liberator.xul
-overlay  chrome://messenger/content/messenger.xul chrome://liberator/content/muttator.xul
+overlay  chrome://messenger/content/messenger.xul chrome://muttator/content/muttator.xul
 
 #1
 #override chrome://liberator/content/compose/liberator.xul chrome://liberator/content/liberator.xul
-overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/liberator.xul
-overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://liberator/content/compose/compose.xul
-
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/compose/liberator.xul
+overlay  chrome://messenger/content/messengercompose/messengercompose.xul chrome://muttator/content/compose/compose.xul
diff --git a/muttator/locale/en-US/asciidoc.conf b/muttator/locale/en-US/asciidoc.conf
new file mode 100644
index 00000000..3e4cbefd
--- /dev/null
+++ b/muttator/locale/en-US/asciidoc.conf
@@ -0,0 +1,83 @@
+[miscellaneous]
+
+[glossary]
+author=Martin Stubenschrott
+email=stubenschrott@gmx.net
+
+# [header]
+# <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+# "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+# <html>
+# <head>
+# <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+# <meta name="generator" content="vimperator" />
+# <link rel="stylesheet" href="xhtml11.css" type="text/css" />
+# <title>{doctitle}</title>
+# </head>
+# <body>
+# <div id="content">
+# <h1>{doctitle}</h1>
+#
+
+[replacements]
+LOGO=<center>image:chrome://muttator/content/muttator.png[Muttator]</center>
+HEADER=<span style="float: right; padding-top: 10px;"><form action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal"> <input type="hidden" name="cmd" value="_s-xclick"> <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1"> <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7----- "></fieldset></form></span>image:chrome://vimperator/content/logo_white.png[Vimperator]
+\[count\]=<span class="argument">&#91;count&#93;</span>
+\[arg\]=<span class="argument">&#91;arg&#93;</span>
+\[arg1\]=<span class="argument">&#91;arg1&#93;</span>
+\[arg2\]=<span class="argument">&#91;arg2&#93;</span>
+\[url\]=<span class="argument">&#91;url&#93;</span>
+\[file\]=<span class="argument">&#91;file&#93;</span>
+\[value\]=<span class="argument">&#91;value&#93;</span>
+\[filter\]=<span class="argument">&#91;filter&#93;</span>
+\[!\]=<span class="argument">&#91;!&#93;</span>
+
+# [macros]
+# section:Introduction[tag1,tag2]
+(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=section
+# help:helptext[href]
+(?su)(?<!\S)[\\]?\|(?P<attrlist>.+?)\|(?!\+)=help
+
+# maximum 3 tags for now
+[section-inlinemacro]
+<table style="border-bottom: 1px solid silver; width: 100%">
+<tr width="100%"><td width="50%"><h2>{target}</h2></td><td width="50%">
+{3? <a id="{3}"/><span class="tag">{3}</span>}
+{2? <a id="{2}"/><span class="tag">{2}</span>}
+{1? <a id="{1}"/><span class="tag">{1}</span>}
+</td></tr>
+</table>
+
+[help-inlinemacro]
+<a href="chrome://muttator/locale/{1}">{target}</a>
+
+[quotes]
+|=tag
+||=key
+[o]=option
+'=option2
+[c]=command
+[m]=mapping
+[a]=argument
+{|}=argument2
+[[|]]=argument3
+# disable monospaced text as all our text is monospaced and it causes problems for some things
++=
+^=
+
+[tags]
+tag=<span class="tag">|</span>
+key=<div class="key">|</div>
+option=<span class="option">|</span>
+option2=<span class="option">'|'</span>
+command=<span class="command">|</span>
+mapping=<span class="mapping">|</span>
+argument=<span class="argument">|</span>
+argument2=<span class="argument">&#123;|&#125;</span>
+argument3=<span class="argument">[|]</span>
+
+[specialwords]
+warningwords=Warning: NOTE: Note:
+
+[warningwords]
+<span class="warning">{words}</span>
diff --git a/muttator/locale/en-US/intro.txt b/muttator/locale/en-US/intro.txt
new file mode 100644
index 00000000..119d123d
--- /dev/null
+++ b/muttator/locale/en-US/intro.txt
@@ -0,0 +1,102 @@
+LOGO
+
++++<center>+++
+*All mail clients suck. Mutt just sucks less. This one just sucks less than
+mutt.*
++++</center>+++
+
+section:Introduction[intro]
+
+http://muttator.mozdev.org[Muttator] is a free browser add-on for Thunderbird,
+which makes it look and behave like the http://www.vim.org[Vim]
+text editor. It has similar key bindings, and you could call it a modal
+mail client, as key bindings differ according to which mode you are in.
+
+|warning| +
+Warning: 
+To provide the most authentic Vim experience, the Thunderbird menubar and toolbar were hidden. + 
+If you really need them, type: [c]:set guioptions+=mT[c] to get them back. + 
+If you don't like Muttator at all, you can uninstall it by typing
+[c]:addons[c] and remove/disable it. + 
+If you like it, but can't remember the shortcuts, press [m]F1[m] or
+[c]:help[c] to get this help window back.
+
+|author| |donation| +
+Muttator was written by mailto:stubenschrott@gmx.net[Martin Stubenschrott].
+If you appreciate my work on Muttator and want to encourage me working on it
+more, you can either send me greetings, patches or make a donation:
+
+NOTE: If this link does not work, go to http://muttator.mozdev.org and click
+the donation button there, because Thunderbird seems to have a problem when
+this link is inside an e-mail (which this help screen actually is).
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+<!-- the PAYPAL code -->
+<center>
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post"><fieldset class="paypal">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
+<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----MIIHPwYJKoZIhvcNAQcEoIIHMDCCBywCAQExggEwMIIBLAIBADCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJKoZIhvcNAQEBBQAEgYAUOJADCwiik68MpIUKcMAtNfs4Cx6RY7604ZujgKj7WVaiELWyhUUDSaq8+iLYaNkRUq+dDld96KwhfodqP3MEmIzpQ/qKvh5+4JzTWSBU5G1lHzc4NJQw6TpXKloPxxXhuGKzZ84/asKZIZpLfkP5i8VtqVFecu7qYc0q1U2KoDELMAkGBSsOAwIaBQAwgbwGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIWR7nX4WwgcqAgZgO41g/NtgfBwI14LlJx3p5Hc4nHsQD2wyu5l4BMndkc3mc0uRTXvzutcfPBxYC4aGV5UDn6c+XPzsne+OAdSs4/0a2DJe85SBDOlVyOekz3rRhy5+6XKpKQ7qfiMpKROladi4opfMac/aDUPhGeVsY0jtQCtelIE199iaVKhlbiDvfE7nzV5dLU4d3VZwSDuWBIrIIi9GMtKCCA4cwggODMIIC7KADAgECAgEAMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTAeFw0wNDAyMTMxMDEzMTVaFw0zNTAyMTMxMDEzMTVaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQDFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwUdO3fxEzEtcnI7ZKZL412XvZPugoni7i7D7prCe0AtaHTc97CYgm7NsAtJyxNLixmhLV8pyIEaiHXWAh8fPKW+R017+EmXrr9EaquPmsVvTywAAE1PMNOKqo2kl4Gxiz9zZqIajOm1fZGWcGS0f5JQ2kBqNbvbg2/Za+GJ/qwUCAwEAAaOB7jCB6zAdBgNVHQ4EFgQUlp98u8ZvF71ZP1LXChvsENZklGswgbsGA1UdIwSBszCBsIAUlp98u8ZvF71ZP1LXChvsENZklGuhgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFsIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRwwGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgV86VpqAWuXvX6Oro4qJ1tYVIT5DgWpE692Ag422H7yRIr/9j/iKG4Thia/Oflx4TdL+IFJBAyPK9v6zZNZtBgPBynXb048hsP16l2vi0k5Q2JKiPDsEfBhGI+HnxLXEaUWAcVfCsQFvd2A1sxRr67ip5y2wwBelUecP3AjJ+YcxggGaMIIBlgIBATCBlDCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA4MDYwNTE0NDk1OFowIwYJKoZIhvcNAQkEMRYEFBpY8FafLq7i3V0czWS9TbR/RjyQMA0GCSqGSIb3DQEBAQUABIGAPvYR9EC2ynooWAvX0iw9aZYTrpX2XrTl6lYkZaLrhM1zKn4RuaiL33sPtq0o0uSKm98gQHzh4P6wmzES0jzHucZjCU4VlpW0fC+/pJxswbW7Qux+ObsNx3f45OcvprqMMZyJiEOULcNhxkm9pCeXQMUGwlHoRRtAxYK2T8L/rQQ=-----END PKCS7-----
+">
+</fieldset></form>
+</center>
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Of course as a believer in free open source software, only make a donation
+if you really like Muttator and the money doesn't hurt - otherwise just use
+it, recommend it and like it :)
+
+section:Help{nbsp}topics[overview]
+
+TO BE WRITTEN...
+
+For now use [c]:viusage[c] to find out about available mappings and
+[c]:exusage[c] to find out about available commands. When in Message mode
+(activated by [m]i[m]), most mappings from Vimperator are available.
+
+// - help:Initialization[starting.html]: How vimperator starts up, where it reads the config file...
+// - help:Browsing[browsing.html]: Basic mappings and commands needed for
+//   a browsing session (how to open a web page or go back in history).
+// - help:Motion{nbsp}commands[motion.html]: How to efficiently scroll in
+//   Vimperator.
+// - help:Options[options.html]: A description of all options.
+// - help:Tabs[tabs.html]: Manage your tabbed browsing session.
+// - help:Marks[marks.html]: Usage of bookmarks, QuickMarks, and history.
+// - help:Repeating{nbsp}commands[repeat.html]: Usage of macros to repeat
+//   recurring workflows.
+// - help:Autocommands[autocommands.html]: Automatically execute code on ceratain
+//   events.
+// - help:Developer{nbsp}Information[developer.html]: How to write docs or
+//   plugins.
+// - help:Various[various.html]: Other help which didn't fit into any other category.
+
+You can also jump directly to the help of a specific command with [c]:help
+o[c] or [c]:help :set[c].
+
+section:Features[features]
+
+* Vim-like keybindings ([m]h[m], [m]j[m], [m]k[m], [m]l[m],
+  [m]gg[m], [m]G[m], [m]0[m], [m]$[m], [m]ZZ[m], [m]<C-f>[m], etc.)
+* Ex-commands ([c]:quit[c], [c]:goto Inbox[c], ...)
+* Tab completion available for all commands with support for 'longest' matching when set in 'wildmode'
+* Hit-a-hint like navigation of links (start with [m]f[m] to follow a link)
+* Minimal GUI (easily hide useless menubar and toolbar with [c]:set guioptions=f[c])
+* Ability to [c]:source[c] javascript files, and to use a [a]~/.muttatorrc[a] file
+* Count supported for many commands ([m]3<C-o>[m] will go back 3 messages)
+* Beep on errors
+* [c]:map[c] support (and feedkeys() for script writers)
+* [c]:time[c] support for profiling
+* Many other vimperator features are available when in -- MESSAGE -- mode
+
+// * A comprehensive help file, explaining all commands, mappings and options.
+
+section:Contact[contact]
+
+Please send comments/bug reports/patches to the mailing list, where I will
+properly answer any questions. You can also join the #vimperator IRC channel
+on irc.freenode.net or check the Wiki for frequently asked questions. Make
+sure, you have read the TODO file first, as I am aware of many things which
+can be improved when I find time for it or get patches.
+
+// vim: set syntax=asciidoc:
diff --git a/muttator/locale/en-US/xhtml11.css b/muttator/locale/en-US/xhtml11.css
new file mode 100644
index 00000000..7a959da4
--- /dev/null
+++ b/muttator/locale/en-US/xhtml11.css
@@ -0,0 +1,333 @@
+/*

+  CSS stylesheet for XHTML produced by DocBook XSL stylesheets.

+  Tested with XSL stylesheets 1.61.2, 1.67.2

+*/

+

+span.strong {

+  font-weight: bold;

+}

+

+a {

+	color: #4A708B;

+	text-decoration: none;

+}

+

+body blockquote {

+  margin-top: .75em;

+  line-height: 1.5;

+  margin-bottom: .75em;

+}

+

+html body {

+  /*margin: 1em 5% 1em 5%;*/

+  margin: auto;

+  padding-left: 25px;

+  padding-right: 25px;

+  line-height: 1.2;

+  font-family: -moz-fixed;

+  max-width: 800px;

+}

+

+body div {

+  margin: 0;

+}

+

+h1, h2, h3, h4, h5, h6,

+div.toc p b,

+div.list-of-figures p b,

+div.list-of-tables p b,

+div.abstract p.title

+{

+  color: #527bbd;

+}

+

+div.toc p:first-child,

+div.list-of-figures p:first-child,

+div.list-of-tables p:first-child,

+div.example p.title

+{

+  margin-bottom: 0.1em;

+}

+

+body h1 {

+  margin: .0em 0 0 -4%;

+  line-height: 1.3;

+  border-bottom: 1px solid silver;

+}

+

+body h2 {

+  /* necessary, because we put h2 into tables */

+  margin-top: 20px !important;

+  margin-bottom: 0px !important;

+  line-height: 1.3;

+  /*border-bottom: 1px solid silver;*/

+}

+

+body h3 {

+  margin: .8em 0 0 -3%;

+  line-height: 1.3;

+}

+

+body h4 {

+  margin: .8em 0 0 -3%;

+  line-height: 1.3;

+}

+

+body h5 {

+  margin: .8em 0 0 -2%;

+  line-height: 1.3;

+}

+

+body h6 {

+  margin: .8em 0 0 -1%;

+  line-height: 1.3;

+}

+

+body hr {

+  border: none; /* Broken on IE6 */

+}

+div.footnotes hr {

+  border: 1px solid silver;

+}

+

+div.navheader th, div.navheader td, div.navfooter td {

+  font-size: 0.9em;

+  font-weight: bold;

+  color: #527bbd;

+}

+div.navheader img, div.navfooter img {

+  border-style: none;

+}

+div.navheader a, div.navfooter a {

+  font-weight: normal;

+}

+div.navfooter hr {

+  border: 1px solid silver;

+}

+

+body td {

+  line-height: 1.2

+}

+

+body th {

+  line-height: 1.2;

+}

+

+ol {

+  line-height: 1.2;

+}

+

+ul, body dir, body menu {

+  line-height: 1.2;

+}

+

+html {

+  margin: 0; 

+  padding: 0;

+}

+

+body h1, body h2, body h3, body h4, body h5, body h6 {

+  margin-left: 0

+} 

+

+body pre {

+  margin: 0.5em 10% 0.5em 1em;

+  line-height: 1.2;

+  color: navy;

+}

+

+tt.literal, code.literal {

+  color: navy;

+}

+

+

+.programlisting, .screen, .listingblock {

+  border: 1px solid silver;

+  background: #f4f4f4;

+  margin: 0.5em 10% 0.5em 0;

+  padding: 0.5em 1em;

+}

+

+div.sidebar {

+  background: #ffffee;

+  margin: 1.0em 10% 0.5em 0;

+  padding: 0.5em 1em;

+  border: 1px solid silver;

+}

+div.sidebar * { padding: 0; }

+div.sidebar div { margin: 0; }

+div.sidebar p.title {

+  margin-top: 0.5em;

+  margin-bottom: 0.2em;

+}

+

+div.bibliomixed {

+  margin: 0.5em 5% 0.5em 1em;

+}

+

+#footer {

+	margin: 15px;

+	text-align: center;

+	color: gray;

+}

+

+div.glossary dt {

+  font-weight: bold;

+}

+div.glossary dd p {

+  margin-top: 0.2em;

+}

+

+dl {

+  margin: .8em 0;

+  line-height: 1.2;

+}

+

+dt {

+  margin-top: 0.5em;

+}

+

+dt span.term {

+  font-style: italic;

+}

+

+div.variablelist dd p {

+  margin-top: 0;

+}

+

+div.itemizedlist li, div.orderedlist li {

+  margin-left: -0.8em;

+  margin-top: 0.5em;

+}

+

+ul, ol {

+    list-style-position: outside;

+}

+

+div.sidebar ul, div.sidebar ol {

+    margin-left: 2.8em;

+}

+

+div.itemizedlist p.title,

+div.orderedlist p.title,

+div.variablelist p.title

+{

+  margin-bottom: -0.8em;

+}

+

+div.revhistory table {

+  border-collapse: collapse;

+  border: none;

+}

+div.revhistory th {

+  border: none;

+  color: #527bbd;

+}

+div.revhistory td {

+  border: 1px solid silver;

+}

+

+/* Keep TOC and index lines close together. */

+div.toc dl, div.toc dt,

+div.list-of-figures dl, div.list-of-figures dt,

+div.list-of-tables dl, div.list-of-tables dt,

+div.indexdiv dl, div.indexdiv dt

+{

+  line-height: normal;

+  margin-top: 0;

+  margin-bottom: 0;

+}

+

+/*

+  Table styling does not work because of overriding attributes in

+  generated HTML.

+*/

+div.table table,

+div.informaltable table

+{

+    margin-left: 0;

+    margin-right: 5%;

+    margin-bottom: 0.8em;

+}

+div.informaltable table

+{

+    margin-top: 0.4em

+}

+div.table thead,

+div.table tfoot,

+div.table tbody,

+div.informaltable thead,

+div.informaltable tfoot,

+div.informaltable tbody

+{

+    /* No effect in IE6. */

+    border-top: 2px solid #527bbd;

+    border-bottom: 2px solid #527bbd;

+}

+div.table thead, div.table tfoot,

+div.informaltable thead, div.informaltable tfoot

+{

+    font-weight: bold;

+}

+

+div.mediaobject img {

+    border: 1px solid silver;

+    margin-bottom: 0.8em;

+}

+div.figure p.title,

+div.table p.title

+{

+  margin-top: 1em;

+  margin-bottom: 0.4em;

+}

+

+@media print {

+  div.navheader, div.navfooter { display: none; }

+}

+

+/* my additions */

+span.tag, span.hiddentag {

+    font-weight: bold;

+    color: rgb(255, 0, 255); /* magenta */

+    padding-left: 15px;

+    float: right;

+}

+/* inside a table cell means this tag is part of a section */

+td span.tag {

+	padding-top: 25px !important;

+}

+

+div.key {

+    color: rgb(255, 0, 255); /* magenta */

+    min-width: 120px; /* with 20px padding actually 140px */

+	/*padding-bottom: 5px;*/

+	padding-right: 20px;

+    float: left;

+}

+span.warning {

+  font-weight: bold;

+  color: red;

+}

+fieldset.paypal {

+    border: none;

+}

+

+.argument {

+    color: #6A97D4;

+}

+.command {

+    font-weight: bold;

+    color: #632610;

+}

+.mapping {

+    font-weight: bold;

+    color: #102663;

+}

+.option {

+    font-weight: bold;

+    color: #106326;

+}

+.quoteblock {

+	margin-left: 140px;

+	padding-bottom: 10px;

+}

diff --git a/muttator/skin/icon.png b/muttator/skin/icon.png
new file mode 100644
index 00000000..b65189b4
--- /dev/null
+++ b/muttator/skin/icon.png
diff --git a/muttator/skin/liberator.css b/muttator/skin/liberator.css
new file mode 100644
index 00000000..1dcaf2d9
--- /dev/null
+++ b/muttator/skin/liberator.css
@@ -0,0 +1,207 @@
+/***** BEGIN LICENSE BLOCK ***** {{{
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+(c) 2006-2008: Martin Stubenschrott <stubenschrott@gmx.net>
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+}}} ***** END LICENSE BLOCK *****/
+
+#liberator-container  {
+    font-family: monospace;
+}
+
+#liberator-completions {
+    -moz-user-focus: ignore;
+    overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
+    border-width: 0px !important;
+    /*-moz-appearance: none !important; /* prevent an ugly 3D border */
+}
+
+/* the selected item in listboxes is hardly readable without this */
+#liberator-completion    > listitem[selected="true"] > listcell,
+#liberator-bufferwindow  > listitem[selected="true"] > listcell,
+#liberator-previewwindow > listitem[selected="true"] > listcell {
+   background-color: Highlight !important;
+   color: HighlightText !important;
+}
+
+/*.liberator-compitem {
+    min-height: 16px;
+}*/
+
+/* fixes the min-height: 22px from firefox */
+#status-bar, statusbarpanel {
+    -moz-appearance: none !important;
+	min-height: 18px !important;
+    border: none !important;
+    font-weight: bold;
+    font-family: monospace;
+}
+#liberator-statusline {
+    font-family: monospace;
+    margin: 0px;
+}
+#liberator-statusline > label {
+    padding: 0px 0px 0px 8px;
+}
+#liberator-statusline > label:first-child {
+    padding: 0px;
+}
+#liberator-statusline-field-url {
+    background-color: inherit;
+    color: inherit;
+}
+
+/* no longer at the window's bottom right corner */
+.statusbar-resizerpanel {
+    display: none;
+}
+#statusbar-display, #statusbar-progresspanel {
+    display: none;
+}
+
+#liberator-commandline {
+    padding: 1px;
+    font-family: monospace;
+    /*
+    background-color: white;
+    color: black;
+    */
+}
+#liberator-commandline-prompt {
+    margin: 0px;
+    padding: 0px;
+    background-color: inherit;
+}
+#liberator-commandline-command {
+    background-color: inherit;
+    color: inherit;
+}
+
+#liberator-visualbell {
+    border: none;
+    background-color: black;
+}
+
+#sidebar {
+    max-width: 90% !important;
+    min-width: 10% !important;
+}
+
+/* highlight groups */
+
+.hl-Normal {
+    background-color: white;
+    color: black;
+}
+.hl-ErrorMsg {
+    background-color: red;
+    color: white;
+    font-weight: bold;
+}
+.hl-InfoMsg {
+    background-color: white;
+    color: magenta;
+}
+.hl-ModeMsg {
+    background-color: white;
+    color: black;
+}
+.hl-MoreMsg {
+    background-color: white;
+    color: green;
+}
+.hl-Question {
+    background-color: white;
+    color: green;
+}
+.hl-Title {
+    background-color: white;
+    color: magenta;
+    font-weight: bold;
+}
+.hl-Warning {
+    background-color: white;
+    color: red;
+}
+.hl-StatusLine {
+    background: none !important;
+    background-color: black !important;
+    color: white !important;
+}
+.hl-StatusLineSecure {
+    background: none !important;
+    background-color: #B0FF00 !important; /* light green */
+    color: black !important;
+}
+.hl-StatusLineBroken {
+    background: none !important;
+    background-color: #FF6060 !important; /* light red */
+    color: black !important;
+}
+.hl-URL {
+    background-color: inherit;
+    color: green;
+    text-decoration: none;
+}
+/* NOTE: .aClass:hover not supported in quirks mode: http://developer.mozilla.org/en/docs/Mozilla_Quirks_Mode_Behavior */
+a.hl-URL:hover {
+    text-decoration: underline;
+    cursor: pointer;
+}
+
+/* MOW */
+
+#liberator-completions, #liberator-multiline-output {
+    overflow: hidden;
+    background-color: white;
+    color: black;
+}
+
+#liberator-completions-content, #liberator-multiline-output-content {
+    white-space: pre;
+    font-family: -moz-fixed;
+    margin: 0px;
+}
+
+#liberator-completions-content *, #liberator-multiline-output-content * {
+    font: inherit;
+}
+
+#liberator-completions-content table, #liberator-multiline-output-content table {
+    white-space: inherit;
+    border-spacing: 0px;
+}
+
+#liberator-completions-content td, #liberator-multiline-output-content td,
+#liberator-completions-content th, #liberator-multiline-output-content th {
+    padding: 0px 2px;
+}
+
+/* for muttator's composer */
+#content-frame, #appcontent {
+    border: 0px;
+}
+
+
+/* vim: set fdm=marker sw=4 ts=4 et: */