diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a17ceeef..60b427c25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Delta Chat Changelog
 
 ## v0.1.33
-2017-04-27
+2017-04-28
 
 * Better support for right-to-left (RTL) languages, taking advantage of
   Android 4.2 (Jelly Bean MR1, API level 17).
@@ -9,6 +9,8 @@
 * If JPEG files are send without compression, they still appear as image, not as attached files
 * Raise-to-speak defaults to false
 * Unify long click behaviour
+* Support Android's system function "Delete data"
+* Replies to messages pop up automatically even if send from other email addresses (typical scenario for alias addresses)
 
 ## v0.1.32
 2017-04-22
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java b/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java
index 6f584f8be..8c023901d 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/ContactsController.java
@@ -196,7 +196,7 @@ public class ContactsController {
         final String email = tempEmail;
         final String fallbackName = tempName;
 
-        // bind e-mail+name address to view object to detect overwrites and discard loading old images (may happen on fast scrolling)
+        // bind email+name address to view object to detect overwrites and discard loading old images (may happen on fast scrolling)
         // moreover, check if the avatar is in cache
         AvtCacheEntry cacheEntry;
         synchronized (s_sync) {
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
index 6c70a7852..efc8ce1ea 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MrChat.java
@@ -145,7 +145,7 @@ public class MrChat {
 
     public String getNameNAddr()
     {
-        // returns name of group chats or name+e-mail-address for normal chats
+        // returns name of group chats or name+email-address for normal chats
         String name = "ErrGrpNameNAddr";
         if( getType()==MR_CHAT_GROUP ) {
             name = getName();
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
index b575a89ef..5002c793a 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java
@@ -439,8 +439,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 }
                 else if ( id == ID_DELETE_CHAT)
                 {
-                    // as the history may be a mix of messenger-messages and e-mails, it is not safe to delete it.
-                    // the user can delete explicit messages or use his e-mail programm to delete masses.
+                    // as the history may be a mix of messenger-messages and emails, it is not safe to delete it.
+                    // the user can delete explicit messages or use his email programm to delete masses.
                     if (getParentActivity() == null) {
                         return;
                     }
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index 7a8a836d2..d21a505ea 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -304,7 +304,7 @@
     <string name="AccountSettings">Account settings</string>
     <string name="MyAccount">My account</string>
     <string name="MyName">My name</string>
-    <string name="MyNameExplain">Your name, as shown to the receivers.\n\nIf you do not enter a name here, the receivers will only get your e-mail-address from the account settings.</string>
+    <string name="MyNameExplain">Your name, as shown to the receivers.\n\nIf you do not enter a name here, the receivers will only get your email-address from the account settings.</string>
     <string name="Password">Password</string>
     <string name="SmtpPassword">SMTP password</string>
     <string name="FromAbove">From above</string>
@@ -317,8 +317,8 @@
     <string name="ImapPort">IMAP port</string>
     <string name="InboxHeadline">Inbox</string>
     <string name="OutboxHeadline">Outbox</string>
-    <string name="MyAccountExplain">For known e-mail providers, additional settings are determinated automatically.</string>
-    <string name="MyAccountExplain2" >Sometimes, <![CDATA[<b>]]>IMAP needs to be enabled<![CDATA[</b>]]> in the e-mail web frontend.\n\nOn problems, ask your e-mail provider or your friends.</string>
+    <string name="MyAccountExplain">For known email providers, additional settings are determinated automatically.</string>
+    <string name="MyAccountExplain2" >Sometimes, <![CDATA[<b>]]>IMAP needs to be enabled<![CDATA[</b>]]> in the email web frontend.\n\nOn problems, ask your email provider or your friends.</string>
     <string name="AccountNotConfigured">Account not configured</string>
     <string name="AboutThisProgram">About Delta Chat</string>
     <string name="NotSet">Not set</string>
@@ -331,9 +331,9 @@
     <string name="NotYetImplemented">This function is not available or incomplete.</string>
     <string name="DefaultStatusText">Sent with my Delta Chat Messenger</string>
     <string name="Name" >Name</string>
-    <string name="EmailAddress">E-mail address</string>
+    <string name="EmailAddress">Email address</string>
     <string name="CannotDeleteContact">Cannot delete contacts in use, block contact instead.</string>
-    <string name="BadEmailAddress">Bad e-mail address.</string>
+    <string name="BadEmailAddress">Bad email address.</string>
     <string name="ContactCreated">Contact created.</string>
     <string name="ViewProfile">View profile</string>
     <!-- Translators: please use a very short string here, it should not much longer than