diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -112,6 +112,9 @@ void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLa
   // feature was deleted
   connect( mVlayer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( featureDeleted( QgsFeatureId ) ) );
 
+  // rolling back
+  connect( mVlayer, SIGNAL( beforeRollBack() ), this, SLOT( beforeRollBack() ) );
+
   // projection or extents changed
   connect( canvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( updateVertexMarkersPosition() ) );
   connect( canvas, SIGNAL( extentsChanged() ), this, SLOT( updateVertexMarkersPosition() ) );
@@ -122,6 +125,13 @@ void QgsSelectedFeature::setSelectedFeature( QgsFeatureId featureId, QgsVectorLa
   replaceVertexMap();
 }
 
+void QgsSelectedFeature::beforeRollBack()
+{
+  QgsDebugCall;
+  disconnect( mVlayer, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry & ) ), this, SLOT( geometryChanged( QgsFeatureId, QgsGeometry & ) ) );
+  deleteVertexMap();
+}
+
 void QgsSelectedFeature::beginGeometryChange()
 {
   Q_ASSERT( !mChangingGeometry );
@@ -163,6 +173,7 @@ void QgsSelectedFeature::geometryChanged( QgsFeatureId fid, QgsGeometry &geom )
 
 void QgsSelectedFeature::validateGeometry( QgsGeometry *g )
 {
+  QgsDebugCall;
   QSettings settings;
   if ( settings.value( "/qgis/digitizing/validate_geometries", 1 ).toInt() == 0 )
     return;
@@ -293,6 +304,9 @@ void QgsSelectedFeature::deleteSelectedVertexes()
     }
   }
 
+  if ( nSelected > 0 )
+    endGeometryChange();
+
   if ( count > 0 )
   {
     mVlayer->endEditCommand();
@@ -356,6 +370,9 @@ void QgsSelectedFeature::moveSelectedVertexes( const QgsVector &v )
     }
   }
 
+  if ( nUpdates > 0 )
+    endGeometryChange();
+
   mVlayer->endEditCommand();
 }
 

diff --git a/src/app/nodetool/qgsselectedfeature.h b/src/app/nodetool/qgsselectedfeature.h
@@ -170,6 +170,11 @@ class QgsSelectedFeature: public QObject
      */
     void canvasLayersChanged();
 
+    /*
+     * the changes are rolling back - stop monitoring the geometry
+     */
+    void beforeRollBack();
+
   private:
     /**
      * Deletes whole vertex map.

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2609,6 +2609,8 @@ bool QgsVectorLayer::rollBack( bool deleteBuffer )
     return false;
   }
 
+  emit beforeRollBack();
+
   mEditBuffer->rollBack();
 
   if ( isModified() )

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1101,6 +1101,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
 
     /** return string representing 'true' for a checkbox (added in 1.4)
      * @note not available in python bindings
+     * FIXME: need SIP binding for QPair<QString, QString>
      */
     QPair<QString, QString> checkedState( int idx );
 
@@ -1304,6 +1305,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
 
     QString metadata();
 
+    /** @note not available in python bindings */
     inline QgsGeometryCache* cache() { return mCache; }
 
     /**
@@ -1338,6 +1340,9 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Is emitted, before changes are commited to the data provider */
     void beforeCommitChanges();
 
+    /** Is emitted, before changes are rolled back*/
+    void beforeRollBack();
+
     /**
      * Will be emitted, when a new attribute has been added to this vector layer.
      * Applies only to types {@link QgsFields::OriginEdit} and {@link QgsFields::OriginProvider}

diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp
@@ -24,9 +24,6 @@
 #include "qgslogger.h"
 
 
-
-
-
 QgsVectorLayerUndoCommandAddFeature::QgsVectorLayerUndoCommandAddFeature( QgsVectorLayerEditBuffer* buffer, QgsFeature& f )
     : QgsVectorLayerUndoCommand( buffer )
 {
@@ -115,10 +112,9 @@ void QgsVectorLayerUndoCommandDeleteFeature::redo()
 
 
 QgsVectorLayerUndoCommandChangeGeometry::QgsVectorLayerUndoCommandChangeGeometry( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, QgsGeometry* newGeom )
-    : QgsVectorLayerUndoCommand( buffer ),
-    mFid( fid )
+    : QgsVectorLayerUndoCommand( buffer )
+    , mFid( fid )
 {
-
   if ( FID_IS_NEW( mFid ) )
   {
     QgsFeatureMap::const_iterator it = mBuffer->mAddedFeatures.find( mFid );
@@ -136,6 +132,28 @@ QgsVectorLayerUndoCommandChangeGeometry::QgsVectorLayerUndoCommandChangeGeometry
   mNewGeom = new QgsGeometry( *newGeom );
 }
 
+int QgsVectorLayerUndoCommandChangeGeometry::id() const
+{
+  return 1;
+}
+
+bool QgsVectorLayerUndoCommandChangeGeometry::mergeWith( const QUndoCommand *other )
+{
+  if ( other->id() != id() )
+    return false;
+
+  const QgsVectorLayerUndoCommandChangeGeometry *merge = dynamic_cast<const QgsVectorLayerUndoCommandChangeGeometry *>( other );
+  if ( !merge )
+    return false;
+
+  delete mNewGeom;
+  mNewGeom = merge->mNewGeom;
+  merge->mNewGeom = 0;
+
+  QgsDebugMsg( "geometry changes merged" );
+  return true;
+}
+
 QgsVectorLayerUndoCommandChangeGeometry::~QgsVectorLayerUndoCommandChangeGeometry()
 {
   delete mOldGeom;
@@ -197,17 +215,13 @@ void QgsVectorLayerUndoCommandChangeGeometry::redo()
 }
 
 
-
-
-
 QgsVectorLayerUndoCommandChangeAttribute::QgsVectorLayerUndoCommandChangeAttribute( QgsVectorLayerEditBuffer* buffer, QgsFeatureId fid, int fieldIndex, const QVariant& newValue )
-    : QgsVectorLayerUndoCommand( buffer ),
-    mFid( fid ),
-    mFieldIndex( fieldIndex ),
-    mNewValue( newValue ),
-    mFirstChange( true )
+    : QgsVectorLayerUndoCommand( buffer )
+    , mFid( fid )
+    , mFieldIndex( fieldIndex )
+    , mNewValue( newValue )
+    , mFirstChange( true )
 {
-
   if ( FID_IS_NEW( mFid ) )
   {
     // work with added feature
@@ -293,13 +307,9 @@ void QgsVectorLayerUndoCommandChangeAttribute::redo()
 }
 
 
-
-
-
-
 QgsVectorLayerUndoCommandAddAttribute::QgsVectorLayerUndoCommandAddAttribute( QgsVectorLayerEditBuffer* buffer, const QgsField& field )
-    : QgsVectorLayerUndoCommand( buffer ),
-    mField( field )
+    : QgsVectorLayerUndoCommand( buffer )
+    , mField( field )
 {
   mFieldIndex = layer()->pendingFields().count();
 }
@@ -325,12 +335,9 @@ void QgsVectorLayerUndoCommandAddAttribute::redo()
 }
 
 
-
-
-
 QgsVectorLayerUndoCommandDeleteAttribute::QgsVectorLayerUndoCommandDeleteAttribute( QgsVectorLayerEditBuffer* buffer, int fieldIndex )
-    : QgsVectorLayerUndoCommand( buffer ),
-    mFieldIndex( fieldIndex )
+    : QgsVectorLayerUndoCommand( buffer )
+    , mFieldIndex( fieldIndex )
 {
   const QgsFields& fields = layer()->pendingFields();
   QgsFields::FieldOrigin origin = fields.fieldOrigin( mFieldIndex );

diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h
@@ -24,6 +24,7 @@
 
 #include "qgsfield.h"
 #include "qgsfeature.h"
+#include "qgslogger.h"
 
 class QgsGeometry;
 class QgsGeometryCache;
@@ -35,9 +36,15 @@ class QgsGeometryCache;
 class QgsVectorLayerUndoCommand : public QUndoCommand
 {
   public:
-    QgsVectorLayerUndoCommand( QgsVectorLayerEditBuffer* buffer ) : mBuffer( buffer ) {}
-    inline QgsVectorLayer* layer() { return mBuffer->L; }
-    inline QgsGeometryCache* cache() { return mBuffer->L->cache(); }
+    QgsVectorLayerUndoCommand( QgsVectorLayerEditBuffer *buffer )
+        : QUndoCommand()
+        , mBuffer( buffer )
+    {}
+    inline QgsVectorLayer *layer() { return mBuffer->L; }
+    inline QgsGeometryCache *cache() { return mBuffer->L->cache(); }
+
+    virtual int id() const { return -1; }
+    virtual bool mergeWith( QUndoCommand * ) { return -1; }
 
   protected:
     QgsVectorLayerEditBuffer* mBuffer;
@@ -79,11 +86,13 @@ class QgsVectorLayerUndoCommandChangeGeometry : public QgsVectorLayerUndoCommand
 
     virtual void undo();
     virtual void redo();
+    virtual int id() const;
+    virtual bool mergeWith( const QUndoCommand * );
 
   private:
     QgsFeatureId mFid;
     QgsGeometry* mOldGeom;
-    QgsGeometry* mNewGeom;
+    mutable QgsGeometry* mNewGeom;
 };