diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
index 35d99e586d..3c10c88673 100644
--- a/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
+++ b/src/AddIns/Misc/AddInManager2/Project/Src/View/AddInManagerView.xaml
@@ -149,7 +149,8 @@
 					Grid.Column="1"
 					Margin="4, 4"
 					TextTrimming="CharacterEllipsis"
-					Text="{Binding Path=Message}"/>
+					Text="{Binding Path=Message}"
+					ToolTip="{Binding Path=Message}" />
 				<Button
 					Grid.Column="2"
 					Content="{core:Localize Global.CloseButtonText}"
diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInManagerViewModel.cs b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInManagerViewModel.cs
index 2be93f6687..79ac2a0a9e 100644
--- a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInManagerViewModel.cs
+++ b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInManagerViewModel.cs
@@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 
+using ICSharpCode.Core;
 using ICSharpCode.AddInManager2.Model;
 using ICSharpCode.AddInManager2.View;
 using ICSharpCode.SharpDevelop;
@@ -116,7 +117,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		
 		private void ShowErrorMessage(string message)
 		{
-			this.Message = message;
+			this.Message = StringParser.Parse(message);
 			this.HasError = true;
 		}