diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index ee486fb324..c7314377be 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -265,8 +265,8 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 	}
 	
 	public void switchRotateMapMode(){
-		//TODO: Display Toast R.string.rotate_map_to_bearing + ":\n" + R.string.rotate_map_none_opt
-		int resId = R.string.rotate_map_none_opt;
+		//int resId = R.string.rotate_map_none_opt;
+		String rotMode = R.string.rotate_map_none_opt;
 		if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_NONE && mapView.getRotate() != 0) {
 			// reset manual rotation
 		} else {
@@ -274,12 +274,16 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 			settings.ROTATE_MAP.set(vl);
 
 			if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS) {
-				resId = R.string.rotate_map_compass_opt;
+				//resId = R.string.rotate_map_compass_opt;
+				rotMode = R.string.rotate_map_compass_opt;
 			} else if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING) {
-				resId = R.string.rotate_map_bearing_opt;
+				//resId = R.string.rotate_map_bearing_opt;
+				rotMode = R.string.rotate_map_bearing_opt;
 			}
 		}
-		app.showShortToastMessage(resId);
+		//app.showShortToastMessage(resId);
+		rotMode = R.string.rotate_map_to_bearing + ":\n" + rotMode;
+		app.showToastMessage(rotMode);
 		updateSettings();
 		if(mapView != null) {
 			mapView.refreshMap();