Index: filetype.cpp
===================================================================
--- filetype.cpp	(revision 7083)
+++ filetype.cpp	(working copy)
@@ -126,9 +126,6 @@
 			Width=CurWidth;
 	}
 
-	if (Width>ScrX/2)
-		Width=ScrX/2;
-
 	return Width;
 }
 
@@ -203,16 +200,12 @@
 				SubstFileName(strTitle, Name, ShortName, nullptr, nullptr, nullptr, nullptr, TRUE);
 			}
 
-			size_t Pos=0;
-			int Ampersand=strTitle.Pos(Pos,L'&')?1:0;
+			
+			int Ampersand=strTitle.Contains(L'&')?1:0;
 
-			if (DizWidth+Ampersand>ScrX/2 && Ampersand && static_cast<int>(Pos)>DizWidth)
-				Ampersand=false;
-
 			strMenuText.Format(L"%-*.*s %c ",DizWidth+Ampersand,DizWidth+Ampersand,strTitle.CPtr(),BoxSymbols[BS_V1]);
 		}
 
-		TruncStr(strCommandText,ScrX-DizWidth-14);
 		strMenuText += strCommandText;
 		TypesMenuItem.strName = strMenuText;
 		TypesMenuItem.SetSelect(Index==1);
@@ -396,16 +389,11 @@
 		if (DizWidth)
 		{
 			AssocConfig->GetDescription(id,strTitle);
-			size_t Pos=0;
-			int Ampersand=strTitle.Pos(Pos,L'&')?1:0;
+			int Ampersand=strTitle.Contains(L'&')?1:0;
 
-			if (DizWidth+Ampersand > ScrX/2 && Ampersand && static_cast<int>(Pos) > DizWidth)
-				Ampersand=false;
-
 			strMenuText.Format(L"%-*.*s %c ",DizWidth+Ampersand,DizWidth+Ampersand,strTitle.CPtr(),BoxSymbols[BS_V1]);
 		}
 
-		//TruncStr(strMask,ScrX-DizWidth-14);
 		strMenuText += strMask;
 		TypesMenuItem.strName = strMenuText;
 		TypesMenuItem.SetSelect((int)(Index-1)==MenuPos);