diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index f18013c4f..9a699b518 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -250,8 +250,11 @@ public class PublishProfilePictureActivity extends XmppActivity {
 					if (!support) {
 						this.hintOrWarning
 								.setTextColor(getWarningTextColor());
-						this.hintOrWarning
-								.setText(R.string.error_publish_avatar_no_server_support);
+						if (account.getStatus() == Account.State.ONLINE) {
+							this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
+						} else {
+							this.hintOrWarning.setText(R.string.error_publish_avatar_offline);
+						}
 					}
 				} else {
 					this.avatarUri = this.defaultUri;
@@ -306,8 +309,11 @@ public class PublishProfilePictureActivity extends XmppActivity {
 		} else {
 			disablePublishButton();
 			this.hintOrWarning.setTextColor(getWarningTextColor());
-			this.hintOrWarning
-					.setText(R.string.error_publish_avatar_no_server_support);
+			if (account.getStatus() == Account.State.ONLINE) {
+				this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
+			} else {
+				this.hintOrWarning.setText(R.string.error_publish_avatar_offline);
+			}
 		}
 		if (this.defaultUri != null && uri.equals(this.defaultUri)) {
 			this.secondaryHint.setVisibility(View.INVISIBLE);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 79da0a2fb..c7c791dfb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -692,4 +692,5 @@
 	<string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
 	<string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
 	<string name="delete_selected_keys">Delete selected keys</string>
+	<string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
 </resources>