diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs b/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
index 258f6d21dd..1cc39022ab 100644
--- a/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
+++ b/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
@@ -1606,60 +1606,109 @@ namespace ICSharpCode.NRefactory.CSharp
 				options.WrapLineLength > 0 && wrapping == Wrapping.WrapIfTooLong && wrapNode.StartLocation.Column >= options.WrapLineLength;
 		}
 
-		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
-		{
-			ForceSpacesBefore(invocationExpression.LParToken, policy.SpaceBeforeMethodCallParentheses);
-			if (invocationExpression.Arguments.Any()) {
-				ForceSpacesAfter(invocationExpression.LParToken, policy.SpaceWithinMethodCallParentheses);
+		void FormatArguments(AstNode node)
+		{
+			Wrapping methodCallArgumentWrapping;
+			bool newLineAferMethodCallOpenParentheses;
+			bool methodClosingParenthesesOnNewLine;
+			bool spaceWithinMethodCallParentheses;
+			bool spaceAfterMethodCallParameterComma;
+			bool spaceBeforeMethodCallParameterComma;
+				
+			CSharpTokenNode rParToken;
+			AstNodeCollection<Expression> arguments;
+			var indexer = node as IndexerExpression;
+			if (indexer != null) {
+				methodCallArgumentWrapping = policy.IndexerArgumentWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferIndexerOpenBracket;
+				methodClosingParenthesesOnNewLine = policy.IndexerClosingBracketOnNewLine;
+				spaceWithinMethodCallParentheses = policy.SpacesWithinBrackets;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterBracketComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeBracketComma;
+			
+				rParToken = indexer.RBracketToken;
+				arguments = indexer.Arguments;
+			} else if (node is ObjectCreateExpression) {
+				var oce = node as ObjectCreateExpression;
+				methodCallArgumentWrapping = policy.MethodCallArgumentWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodCallOpenParentheses;
+				methodClosingParenthesesOnNewLine = policy.MethodClosingParenthesesOnNewLine;
+				spaceWithinMethodCallParentheses = policy.SpacesWithinNewParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterNewParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeNewParameterComma;
+			
+				rParToken = oce.RParToken;
+				arguments = oce.Arguments;
 			} else {
-				ForceSpacesAfter(invocationExpression.LParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
-				ForceSpacesBefore(invocationExpression.RParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+				InvocationExpression invocationExpression = node as InvocationExpression;
+				methodCallArgumentWrapping = policy.MethodCallArgumentWrapping;
+				newLineAferMethodCallOpenParentheses = policy.NewLineAferMethodCallOpenParentheses;
+				methodClosingParenthesesOnNewLine = policy.MethodClosingParenthesesOnNewLine;
+				spaceWithinMethodCallParentheses = policy.SpaceWithinMethodCallParentheses;
+				spaceAfterMethodCallParameterComma = policy.SpaceAfterMethodCallParameterComma;
+				spaceBeforeMethodCallParameterComma = policy.SpaceBeforeMethodCallParameterComma;
+			
+				rParToken = invocationExpression.RParToken;
+				arguments = invocationExpression.Arguments;
 			}
 
-			if (invocationExpression.Target is MemberReferenceExpression) {
-				var mt = (MemberReferenceExpression)invocationExpression.Target;
-				if (mt.Target is InvocationExpression) {
-					if (DoWrap(policy.ChainedMethodCallWrapping, mt.DotToken)) {
-						curIndent.Push(IndentType.Continuation);
-						FixStatementIndentation(mt.DotToken.StartLocation);
-						curIndent.Pop();
-					} else {
-						ForceSpacesBeforeRemoveNewLines(mt.DotToken, false);
-					}
-				}
-			}
-			bool wrapMethodCall = DoWrap(policy.MethodCallArgumentWrapping, invocationExpression.RParToken);
-			if (wrapMethodCall && invocationExpression.Arguments.Any()) {
-				if (policy.NewLineAferMethodCallOpenParentheses) {
+			bool wrapMethodCall = DoWrap(methodCallArgumentWrapping, rParToken);
+
+			if (wrapMethodCall && arguments.Any()) {
+				if (newLineAferMethodCallOpenParentheses) {
 					curIndent.Push(IndentType.Continuation);
-					foreach (var arg in invocationExpression.Arguments) {
+					foreach (var arg in arguments) {
 						FixStatementIndentation(arg.StartLocation);
 					}
 					curIndent.Pop();
 				} else {
-					int extraSpaces = invocationExpression.Arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
+					int extraSpaces = arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
 					curIndent.ExtraSpaces += extraSpaces;
-					foreach (var arg in invocationExpression.Arguments.Skip (1)) {
+					foreach (var arg in arguments.Skip(1)) {
 						FixStatementIndentation(arg.StartLocation);
 					}
 					curIndent.ExtraSpaces -= extraSpaces;
 				}
-				if (policy.MethodClosingParenthesesOnNewLine)
-					FixStatementIndentation(invocationExpression.RParToken.StartLocation);
+				if (methodClosingParenthesesOnNewLine)
+					FixStatementIndentation(rParToken.StartLocation);
 			} else {
-				foreach (var arg in invocationExpression.Arguments) {
-					ForceSpacesBeforeRemoveNewLines(arg, policy.SpaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
+				foreach (var arg in arguments) {
+					ForceSpacesBeforeRemoveNewLines(arg, spaceAfterMethodCallParameterComma && arg.PrevSibling.Role == Roles.Comma);
 					arg.AcceptVisitor(this);
 				}
-				ForceSpacesBeforeRemoveNewLines(invocationExpression.RParToken, policy.SpaceWithinMethodCallParentheses);
+				ForceSpacesBeforeRemoveNewLines(rParToken, spaceWithinMethodCallParentheses);
+			}
+			foreach (CSharpTokenNode comma in rParToken.Parent.Children.Where(n => n.Role == Roles.Comma)) {
+				ForceSpacesBefore(comma, spaceBeforeMethodCallParameterComma);
 			}
+		}
 
-			foreach (CSharpTokenNode comma in invocationExpression.Children.Where (node => node.Role == Roles.Comma)) {
-				ForceSpacesBefore(comma, policy.SpaceBeforeMethodCallParameterComma);
+		public override void VisitInvocationExpression(InvocationExpression invocationExpression)
+		{
+			ForceSpacesBefore(invocationExpression.LParToken, policy.SpaceBeforeMethodCallParentheses);
+			if (invocationExpression.Arguments.Any()) {
+				ForceSpacesAfter(invocationExpression.LParToken, policy.SpaceWithinMethodCallParentheses);
+			} else {
+				ForceSpacesAfter(invocationExpression.LParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
+				ForceSpacesBefore(invocationExpression.RParToken, policy.SpaceBetweenEmptyMethodCallParentheses);
 			}
 
 			if (!invocationExpression.Target.IsNull)
 				invocationExpression.Target.AcceptVisitor(this);
+
+			if (invocationExpression.Target is MemberReferenceExpression) {
+				var mt = (MemberReferenceExpression)invocationExpression.Target;
+				if (mt.Target is InvocationExpression) {
+					if (DoWrap(policy.ChainedMethodCallWrapping, mt.DotToken)) {
+						curIndent.Push(IndentType.Continuation);
+						FixStatementIndentation(mt.DotToken.StartLocation);
+						curIndent.Pop();
+					} else {
+						ForceSpacesBeforeRemoveNewLines(mt.DotToken, false);
+					}
+				}
+			}
+			FormatArguments(invocationExpression);
 		}
 
 		public override void VisitIndexerExpression(IndexerExpression indexerExpression)
@@ -1667,39 +1716,12 @@ namespace ICSharpCode.NRefactory.CSharp
 			ForceSpacesBefore(indexerExpression.LBracketToken, policy.SpacesBeforeBrackets);
 			ForceSpacesAfter(indexerExpression.LBracketToken, policy.SpacesWithinBrackets);
 
+			if (!indexerExpression.Target.IsNull)
+				indexerExpression.Target.AcceptVisitor(this);
 
-			bool wrapMethodCall = DoWrap(policy.MethodCallArgumentWrapping, indexerExpression.RBracketToken);
-			if (wrapMethodCall && indexerExpression.Arguments.Any()) {
-				if (policy.NewLineAferMethodCallOpenParentheses) {
-					curIndent.Push(IndentType.Continuation);
-					foreach (var arg in indexerExpression.Arguments) {
-						FixStatementIndentation(arg.StartLocation);
-					}
-					curIndent.Pop();
-				} else {
-					int extraSpaces = indexerExpression.Arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
-					curIndent.ExtraSpaces += extraSpaces;
-					foreach (var arg in indexerExpression.Arguments.Skip (1)) {
-						FixStatementIndentation(arg.StartLocation);
-					}
-					curIndent.ExtraSpaces -= extraSpaces;
-				}
-				if (policy.MethodClosingParenthesesOnNewLine)
-					FixStatementIndentation(indexerExpression.RBracketToken.StartLocation);
-			} else {
-				foreach (var arg in indexerExpression.Arguments) {
-					ForceSpacesBeforeRemoveNewLines(arg, policy.SpaceAfterBracketComma && arg.PrevSibling.Role == Roles.Comma);
-					arg.AcceptVisitor(this);
-				}
-				ForceSpacesBeforeRemoveNewLines(indexerExpression.RBracketToken, policy.SpacesWithinBrackets);
-			}
+			FormatArguments(indexerExpression);
 
-			foreach (CSharpTokenNode comma in indexerExpression.Children.Where (node => node.Role == Roles.Comma)) {
-				ForceSpacesBefore(comma, policy.SpaceBeforeBracketComma);
-			}
 
-			if (!indexerExpression.Target.IsNull)
-				indexerExpression.Target.AcceptVisitor(this);
 
 		}
 
@@ -1752,38 +1774,11 @@ namespace ICSharpCode.NRefactory.CSharp
 					ForceSpacesAfter(objectCreateExpression.LParToken, policy.SpacesBetweenEmptyNewParentheses);
 			}
 
-			bool wrapMethodCall = DoWrap(policy.MethodCallArgumentWrapping, objectCreateExpression.RParToken);
-			if (wrapMethodCall && objectCreateExpression.Arguments.Any()) {
-				if (policy.NewLineAferMethodCallOpenParentheses) {
-					curIndent.Push(IndentType.Continuation);
-					foreach (var arg in objectCreateExpression.Arguments) {
-						FixStatementIndentation(arg.StartLocation);
-					}
-					curIndent.Pop();
-				} else {
-					int extraSpaces = objectCreateExpression.Arguments.First().StartLocation.Column - 1 - curIndent.IndentString.Length;
-					curIndent.ExtraSpaces += extraSpaces;
-					foreach (var arg in objectCreateExpression.Arguments.Skip (1)) {
-						FixStatementIndentation(arg.StartLocation);
-					}
-					curIndent.ExtraSpaces -= extraSpaces;
-				}
-				if (policy.MethodClosingParenthesesOnNewLine)
-					FixStatementIndentation(objectCreateExpression.RParToken.StartLocation);
-			} else {
-				foreach (var arg in objectCreateExpression.Arguments) {
-					ForceSpacesBeforeRemoveNewLines(arg, policy.SpaceAfterNewParameterComma && arg.PrevSibling.Role == Roles.Comma);
-					arg.AcceptVisitor(this);
-				}
-				ForceSpacesBeforeRemoveNewLines(objectCreateExpression.RParToken, policy.SpacesWithinNewParentheses);
-			}
-
-			foreach (CSharpTokenNode comma in objectCreateExpression.Children.Where (node => node.Role == Roles.Comma)) {
-				ForceSpacesBefore(comma, policy.SpaceBeforeNewParameterComma);
-			}
-
 			if (!objectCreateExpression.Type.IsNull)
 				objectCreateExpression.Type.AcceptVisitor(this);
+
+			FormatArguments(objectCreateExpression);
+
 		}
 
 		public override void VisitArrayCreateExpression(ArrayCreateExpression arrayObjectCreateExpression)
diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs b/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
index dada27d727..5a5e0394bb 100644
--- a/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
+++ b/ICSharpCode.NRefactory.CSharp/Formatter/CSharpFormattingOptions.cs
@@ -806,7 +806,20 @@ namespace ICSharpCode.NRefactory.CSharp
 			set;
 		}
 
+		public Wrapping IndexerArgumentWrapping {
+			get;
+			set;
+		}
+
+		public bool NewLineAferIndexerOpenBracket {
+			get;
+			set;
+		}
 
+		public bool IndexerClosingBracketOnNewLine {
+			get;
+			set;
+		}
 		#endregion
 
 		internal CSharpFormattingOptions()
diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs b/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
index dcb0647482..69a2c4e280 100644
--- a/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
+++ b/ICSharpCode.NRefactory.CSharp/Formatter/FormattingOptionsFactory.cs
@@ -178,7 +178,11 @@ namespace ICSharpCode.NRefactory.CSharp
 				ChainedMethodCallWrapping = Wrapping.WrapAlways,
 				MethodCallArgumentWrapping = Wrapping.WrapIfTooLong,
 				NewLineAferMethodCallOpenParentheses = true,
-				MethodClosingParenthesesOnNewLine = true
+				MethodClosingParenthesesOnNewLine = true,
+
+				IndexerArgumentWrapping = Wrapping.WrapIfTooLong,
+				NewLineAferIndexerOpenBracket = false,
+				IndexerClosingBracketOnNewLine = false,
 			};
 		}
 
@@ -320,7 +324,11 @@ namespace ICSharpCode.NRefactory.CSharp
 				ChainedMethodCallWrapping = Wrapping.WrapAlways,
 				MethodCallArgumentWrapping = Wrapping.WrapIfTooLong,
 				NewLineAferMethodCallOpenParentheses = true,
-				MethodClosingParenthesesOnNewLine = true
+				MethodClosingParenthesesOnNewLine = true,
+
+				IndexerArgumentWrapping = Wrapping.WrapIfTooLong,
+				NewLineAferIndexerOpenBracket = false,
+				IndexerClosingBracketOnNewLine = false,
 			};
 		}