1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 06a873a2..e6752839 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -546,6 +546,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			MenuItem downloadFile = menu.findItem(R.id.download_file);
 			MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
 			MenuItem deleteFile = menu.findItem(R.id.delete_file);
+			MenuItem showErrorMessage = menu.findItem(R.id.show_error_message);
 			if (!treatAsFile
 					&& !GeoHelper.isGeoUri(m.getBody())
 					&& m.treatAsDownloadable() != Message.Decision.MUST) {
@@ -589,6 +590,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					deleteFile.setTitle(activity.getString(R.string.delete_x_file, UIHelper.getFileDescriptionString(activity, m)));
 				}
 			}
+			if (m.getStatus() == Message.STATUS_SEND_FAILED && m.getErrorMessage() != null) {
+				showErrorMessage.setVisible(true);
+			}
 		}
 	}
 
@@ -625,11 +629,22 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			case R.id.delete_file:
 				deleteFile(selectedMessage);
 				return true;
+			case R.id.show_error_message:
+				showErrorMessage(selectedMessage);
+				return true;
 			default:
 				return super.onContextItemSelected(item);
 		}
 	}
 
+	private void showErrorMessage(final Message message) {
+		AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+		builder.setTitle(R.string.error_message);
+		builder.setMessage(message.getErrorMessage());
+		builder.setPositiveButton(R.string.confirm,null);
+		builder.create().show();
+	}
+
 	private void shareWith(Message message) {
 		Intent shareIntent = new Intent();
 		shareIntent.setAction(Intent.ACTION_SEND);