diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
index 79ed73b0fbc0dcd6923c9d32baaf2979c0c894c2..45aea89b3d18c42aa754903f076ac08adc2a6d58 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java
@@ -20,7 +20,6 @@ package org.fortiss.tooling.base.ui.editpart;
 import static org.eclipse.draw2d.ColorConstants.red;
 import static org.eclipse.gef.EditPolicy.COMPONENT_ROLE;
 import static org.eclipse.gef.EditPolicy.CONNECTION_BENDPOINTS_ROLE;
-import static org.eclipse.gef.EditPolicy.CONNECTION_ENDPOINTS_ROLE;
 import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_GRID_SIZE;
 import static org.fortiss.tooling.base.ui.utils.LayoutDataUtils.getConnectionPoints;
 
@@ -42,7 +41,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.editparts.AbstractConnectionEditPart;
 import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
 import org.eclipse.gef.requests.BendpointRequest;
 import org.eclipse.swt.graphics.Color;
 import org.fortiss.tooling.base.model.base.ConnectionSegmentBase;
@@ -63,7 +61,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 74FDF792ACC099C197E5AC2210640BE4
+ * @ConQAT.Rating YELLOW Hash: 293CC68BDE51283CB4C8EC65D03D2DD0
  */
 public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase>
 		extends AbstractConnectionEditPart {
@@ -124,8 +122,10 @@ public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase>
 		installEditPolicy(COMPONENT_ROLE, new RemoveEditPolicy());
 		installEditPolicy(CONNECTION_BENDPOINTS_ROLE,
 				new ConnectionBendpointEditPolicy());
-		installEditPolicy(CONNECTION_ENDPOINTS_ROLE,
-				new ConnectionEndpointEditPolicy());
+		// TODO (FH): https://af3.fortiss.org/issues/390
+		// implement reconnect
+		// installEditPolicy(CONNECTION_ENDPOINTS_ROLE,
+		// new ConnectionEndpointEditPolicy());
 	}
 
 	/** {@inheritDoc} */