diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py
index caacf5f32..1deb19ace 100644
--- a/modoboa/extensions/webmail/lib.py
+++ b/modoboa/extensions/webmail/lib.py
@@ -316,7 +316,8 @@ class ReplyModifier(Modifier):
             form.fields["to"].initial = self.From
         else:
             form.fields["to"].initial = self.Reply_To
-        if all: # reply-all
+        if request.GET.get("all", "0") == "1": # reply-all
+            print "reply all"
             form.fields["cc"].initial = ""
             toparse = self.To.split(",")
             if hasattr(self, 'Cc'):
diff --git a/modoboa/extensions/webmail/templates/webmail/compose.html b/modoboa/extensions/webmail/templates/webmail/compose.html
index bf4adec0e..1352c340b 100644
--- a/modoboa/extensions/webmail/templates/webmail/compose.html
+++ b/modoboa/extensions/webmail/templates/webmail/compose.html
@@ -7,7 +7,7 @@
         <a id="add_cc" href="#">{% trans "Add Cc field" %}</a> <a id="add_cci" href="#">{% trans "Add Cci field" %}</a>
       </div>
       {% render_field form.to %}
-      {% render_and_hide_field form.cc %}
+      {% if form.cc.value %}{% render_field form.cc %}{% else %}{% render_and_hide_field form.cc %}{% endif %}
       {% render_and_hide_field form.cci %}
       {% render_field form.subject %}
       <div id="attachments" name="{% url modoboa.extensions.webmail.views.attachments %}">