diff --git a/docs/changelog.rst b/docs/changelog.rst
index 715df28..aa04832 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :bug:`-` fix wrong variable name in
+  managemails.models.MailAddress.set_forward_addresses and typo in
+  managemails.forms.EditMailAddressForm
+
 * :release:`0.11.1 <2015-02-01>`
 * :bug:`-` fix translation of contact form by using ugettext_lazy and adding
   contact_form to INSTALLED_APPS
diff --git a/gnuviechadmin/managemails/forms.py b/gnuviechadmin/managemails/forms.py
index baa6273..bd6a056 100644
--- a/gnuviechadmin/managemails/forms.py
+++ b/gnuviechadmin/managemails/forms.py
@@ -290,5 +290,5 @@ class EditMailAddressForm(forms.ModelForm, MailAddressFieldMixin):
             self.instance.set_mailbox(data['mailbox'], commit)
         elif data['mailbox_or_forwards'] == MAILBOX_OR_FORWARDS.forwards:
             targets = [part.strip() for part in data['forwards'].split(',')]
-            self.instance.set_foward_addresses(targets, commit)
+            self.instance.set_forward_addresses(targets, commit)
         return self.instance
diff --git a/gnuviechadmin/managemails/models.py b/gnuviechadmin/managemails/models.py
index f818b87..397189e 100644
--- a/gnuviechadmin/managemails/models.py
+++ b/gnuviechadmin/managemails/models.py
@@ -209,13 +209,13 @@ class MailAddress(ActivateAbleMixin, TimeStampedModel, models.Model):
                     mafwd = MailAddressForward(mailaddress=self, target=target)
                     if commit:
                         mafwd.save()
-                    retval.append(item)
+                    retval.append(mafwd)
         else:
             for target in addresses:
                 mafwd = MailAddressForward(mailaddress=self, target=target)
                 if commit:
                     mafwd.save()
-                retval.append(item)
+                retval.append(mafwd)
         return retval