diff --git a/build.gradle b/build.gradle
index 4f508cd..3790991 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ android {
 
     defaultConfig {
         applicationId "fr.unix_experience.owncloud_sms"
-        versionCode 56
-        versionName "1.2.3"
+        versionCode 57
+        versionName "1.2.4"
         minSdkVersion 16
         targetSdkVersion 26
         maxSdkVersion 26
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
index ebfb8c8..f500de7 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/activities/MainActivity.java
@@ -205,7 +205,7 @@ public class MainActivity extends AppCompatActivity
 			return;
 		}
 
-		new SyncTask(getApplicationContext()).execute();
+		new SyncTask(this).execute();
 		Log.v(MainActivity.TAG, "Finish syncAllMessages()");
 	}
 
diff --git a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java
index c1c546d..600af56 100644
--- a/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java
+++ b/src/main/java/fr/unix_experience/owncloud_sms/engine/ASyncSMSSync.java
@@ -19,6 +19,7 @@ package fr.unix_experience.owncloud_sms.engine;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
@@ -33,12 +34,14 @@ import fr.unix_experience.owncloud_sms.prefs.OCSMSSharedPrefs;
 
 public interface ASyncSMSSync {
 	class SyncTask extends AsyncTask<Void, Void, Void> {
-		public SyncTask(Context context) {
+		public SyncTask(Activity context) {
+			_activity = context;
 			_context = context;
 			_smsBuffer = null;
 		}
 
 		public SyncTask(Context context, SmsBuffer buffer) {
+			_activity = null;
 			_context = context;
 			_smsBuffer = buffer;
 		}
@@ -70,7 +73,14 @@ public interface ASyncSMSSync {
 				SmsBuffer smsBuffer = new SmsBuffer();
 				fetcher.bufferMessagesSinceDate(smsBuffer, syncStartupDate);
 				if (smsBuffer.empty()) {
-					Toast.makeText(_context, _context.getString(R.string.nothing_to_sync), Toast.LENGTH_SHORT).show();
+					if (_activity != null) {
+						_activity.runOnUiThread(new Runnable() {
+							public void run() {
+								Toast.makeText(_context, _context.getString(R.string.nothing_to_sync), Toast.LENGTH_SHORT).show();
+							}
+						});
+					}
+
 					Log.i(ASyncSMSSync.TAG, "Finish syncAllMessages(): no more sms");
 					smsBuffer.clear();
 					shouldSync = false;
@@ -113,6 +123,7 @@ public interface ASyncSMSSync {
 
 		private final SmsBuffer _smsBuffer;
 		private final Context _context;
+		private final Activity _activity;
 	}
 
 	String TAG = ASyncSMSSync.class.getSimpleName();