diff --git a/License.txt b/License.txt
new file mode 100644
index 00000000..cd24cb86
--- /dev/null
+++ b/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/Makefile b/Makefile
index a65012f0..39bd3b03 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 0.3
+VERSION       = 0.4pre
 NAME          = muttator
 
 include Makefile.common
diff --git a/NEWS b/NEWS
index 4974bb90..9454d759 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
 <pre>
 2008-06-xx:
     * version 0.4
+    * 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, attention: does not save!
+    * new "x" mapping to toggle HTML display (is there a need for "simple HTML"?)
+    * new "h" mapping to toggle headers
     * new "threads" option (non-functional for now)
 
 2008-06-04: