Merge branch 'master' of https://github.com/tonioo/modoboa

doc/conf.py

@@ -50,7 +50,7 @@ copyright = u'2014, Antoine Nguyen'
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.5'
+release = '1.1.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

modoboa/extensions/webmail/forms.py

@@ -77,8 +77,9 @@ def make_body_images_inline(body):
 
 
 class ComposeMailForm(forms.Form):
-    """Compose mail form.
-    """
+
+    """Compose mail form."""
+
     to = forms.CharField(label=_("To"))
     cc = forms.CharField(label=_("Cc"), required=False)
     cci = forms.CharField(label=_("Cci"), required=False)
@@ -88,7 +89,8 @@ class ComposeMailForm(forms.Form):
     origmsgid = forms.CharField(
         label="", widget=forms.HiddenInput(), required=False
     )
-    body = forms.CharField(widget=forms.widgets.Textarea)
+    body = forms.CharField(
+        widget=forms.widgets.Textarea, required=False)
 
     def _html_msg(self):
         """Create a multipart message.

setup.py

@@ -54,7 +54,7 @@ def read(fname):
 
 setup(
     name="modoboa",
-    version='1.1.5',
+    version='1.1.6',
     url='http://modoboa.org/',
     license='MIT',
     description="Mail hosting made simple",