diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index 3a9004b04..4f6e7fe5d 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -352,6 +352,7 @@ public class ContactSelectionListFragment extends    Fragment
     void onContactDeselected(int specialId, String number);
   }
 
+  @Override
   public void handleEvent(int eventId, Object data1, Object data2) {
     if (eventId==DcContext.DC_EVENT_CONTACTS_CHANGED) {
       getLoaderManager().restartLoader(0, null, ContactSelectionListFragment.this);
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 8dcb69980..99cfb1d5f 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1879,6 +1879,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  @Override
   public void handleEvent(int eventId, Object data1, Object data2) {
     if (eventId==DcContext.DC_EVENT_CHAT_MODIFIED || eventId==DcContext.DC_EVENT_CONTACTS_CHANGED) {
       onModified(recipient);
diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 17c880322..e43b3af49 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -895,6 +895,7 @@ public class ConversationFragment extends Fragment
     }
   }
 
+  @Override
   public void handleEvent(int eventId, Object data1, Object data2) {
     if(eventId== DcContext.DC_EVENT_MSG_DELIVERED) {
       Log.w(TAG, "DC_EVENT_MSG_DELIVERED reveived for msg#"+(Long)data1);
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index ecf5826dc..ea99ef75c 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -562,6 +562,7 @@ public class ConversationListFragment extends Fragment
     }
   }
 
+  @Override
   public void handleEvent(int eventId, Object data1, Object data2) {
     getLoaderManager().restartLoader(0,null,this);
   }
diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java
index ac36d1031..a66508d2d 100644
--- a/src/org/thoughtcrime/securesms/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/WelcomeActivity.java
@@ -182,6 +182,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen
         dcContext.imex(DcContext.DC_IMEX_IMPORT_BACKUP, backupFile);
     }
 
+    @Override
     public void handleEvent(int eventId, Object data1, Object data2) {
         if (eventId== DcContext.DC_EVENT_IMEX_PROGRESS) {
             ApplicationDcContext dcContext = DcHelper.getContext(this);
diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
index 0b8611a41..d6f79e5b4 100644
--- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
+++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java
@@ -287,7 +287,8 @@ public class ApplicationDcContext extends DcContext {
         }
     }
 
-    @Override public long handleEvent(final int event, long data1, long data2) {
+    @Override
+    public long handleEvent(final int event, long data1, long data2) {
         switch(event) {
             case DC_EVENT_INFO:
                 Log.i("DeltaChat", dataToString(data2));