diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
index 2c6666e925..6c55242e35 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
@@ -808,7 +808,11 @@ public class MenuBuilder {
 		View.OnClickListener onClickListener = new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				POIMapLayer.showHtmlDescriptionDialog(view.getContext(), app, description, descriptionLabel);
+				if (description.contains("</")) {
+					POIMapLayer.showHtmlDescriptionDialog(view.getContext(), app, description, descriptionLabel);
+				} else {
+					POIMapLayer.showPlainDescriptionDialog(view.getContext(), app, description, descriptionLabel);
+				}
 			}
 		};
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
index 846c2cdd0e..45d0e348f2 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
@@ -302,7 +302,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			ll.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					POIMapLayer.showDescriptionDialog(view.getContext(), app, text, textPrefix);
+					POIMapLayer.showPlainDescriptionDialog(view.getContext(), app, text, textPrefix);
 				}
 			});
 		}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java
index 278e0cd432..532ef2a676 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/WptPtMenuBuilder.java
@@ -61,7 +61,7 @@ public class WptPtMenuBuilder extends MenuBuilder {
 		View.OnClickListener clickListener = new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				POIMapLayer.showDescriptionDialog(view.getContext(), app, wpt.desc, textPrefix);
+				POIMapLayer.showPlainDescriptionDialog(view.getContext(), app, wpt.desc, textPrefix);
 			}
 		};
 
@@ -103,7 +103,7 @@ public class WptPtMenuBuilder extends MenuBuilder {
 			rowc.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					POIMapLayer.showDescriptionDialog(rowc.getContext(), app, wpt.comment,
+					POIMapLayer.showPlainDescriptionDialog(rowc.getContext(), app, wpt.comment,
 							rowc.getResources().getString(R.string.poi_dialog_comment));
 				}
 			});
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
index 758588228f..85b538b6c6 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
@@ -274,7 +274,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 		return true;
 	}
 
-	public static void showDescriptionDialog(Context ctx, OsmandApplication app, String text, String title) {
+	public static void showPlainDescriptionDialog(Context ctx, OsmandApplication app, String text, String title) {
 		final TextView textView = new TextView(ctx);
 		LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 		int textMargin = dpToPx(app, 10f);