diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/EditCommitMessageHandler.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/EditCommitMessageHandler.java
index ba50417..4bb182f 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/EditCommitMessageHandler.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/EditCommitMessageHandler.java
@@ -14,7 +14,6 @@
 
 package com.google.gerrit.httpd.rpc.changedetail;
 
-import com.google.gerrit.common.ChangeHooks;
 import com.google.gerrit.common.data.ChangeDetail;
 import com.google.gerrit.common.errors.EmailException;
 import com.google.gerrit.common.errors.NoSuchEntityException;
@@ -25,12 +24,11 @@
 import com.google.gerrit.server.ChangeUtil;
 import com.google.gerrit.server.GerritPersonIdent;
 import com.google.gerrit.server.IdentifiedUser;
-import com.google.gerrit.server.config.TrackingFooters;
+import com.google.gerrit.server.change.PatchSetInserter;
 import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.validators.CommitValidators;
 import com.google.gerrit.server.mail.CommitMessageEditedSender;
-import com.google.gerrit.server.patch.PatchSetInfoFactory;
 import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException;
 import com.google.gerrit.server.project.ChangeControl;
 import com.google.gerrit.server.project.InvalidChangeOperationException;
@@ -61,21 +59,14 @@
   private final IdentifiedUser currentUser;
   private final ChangeDetailFactory.Factory changeDetailFactory;
   private final CommitMessageEditedSender.Factory commitMessageEditedSenderFactory;
-
   private final GitReferenceUpdated gitRefUpdated;
-
   private final PatchSet.Id patchSetId;
   @Nullable
   private final String message;
-
-  private final ChangeHooks hooks;
   private final CommitValidators.Factory commitValidatorsFactory;
-
   private final GitRepositoryManager gitManager;
-  private final PatchSetInfoFactory patchSetInfoFactory;
-
   private final PersonIdent myIdent;
-  private final TrackingFooters trackingFooters;
+  private final PatchSetInserter patchSetInserter;
 
   @Inject
   EditCommitMessageHandler(final ChangeControl.Factory changeControlFactory,
@@ -83,29 +74,24 @@
       final ChangeDetailFactory.Factory changeDetailFactory,
       final CommitMessageEditedSender.Factory commitMessageEditedSenderFactory,
       @Assisted final PatchSet.Id patchSetId,
-      @Assisted @Nullable final String message, final ChangeHooks hooks,
+      @Assisted @Nullable final String message,
       final CommitValidators.Factory commitValidatorsFactory,
       final GitRepositoryManager gitManager,
-      final PatchSetInfoFactory patchSetInfoFactory,
       final GitReferenceUpdated gitRefUpdated,
       @GerritPersonIdent final PersonIdent myIdent,
-      TrackingFooters trackingFooters) {
+      final PatchSetInserter patchSetInserter) {
     this.changeControlFactory = changeControlFactory;
     this.db = db;
     this.currentUser = currentUser;
     this.changeDetailFactory = changeDetailFactory;
     this.commitMessageEditedSenderFactory = commitMessageEditedSenderFactory;
-
     this.patchSetId = patchSetId;
     this.message = message;
-    this.hooks = hooks;
     this.commitValidatorsFactory = commitValidatorsFactory;
     this.gitManager = gitManager;
-
-    this.patchSetInfoFactory = patchSetInfoFactory;
     this.gitRefUpdated = gitRefUpdated;
     this.myIdent = myIdent;
-    this.trackingFooters = trackingFooters;
+    this.patchSetInserter = patchSetInserter;
   }
 
   @Override
@@ -132,8 +118,7 @@
           commitValidatorsFactory.create(control.getRefControl(), new NoSshInfo(), git);
 
       ChangeUtil.editCommitMessage(patchSetId, control.getRefControl(), commitValidators, currentUser, message, db,
-          commitMessageEditedSenderFactory, hooks, git, patchSetInfoFactory, gitRefUpdated, myIdent,
-          trackingFooters);
+          commitMessageEditedSenderFactory, git, gitRefUpdated, myIdent, patchSetInserter);
 
       return changeDetailFactory.create(changeId).call();
     } finally {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 2d1707c..3de8ad4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -29,6 +29,7 @@
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.change.ChangeInserter;
 import com.google.gerrit.server.change.ChangeMessages;
+import com.google.gerrit.server.change.PatchSetInserter;
 import com.google.gerrit.server.config.TrackingFooter;
 import com.google.gerrit.server.config.TrackingFooters;
 import com.google.gerrit.server.events.CommitReceivedEvent;
@@ -46,7 +47,6 @@
 import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.gerrit.server.project.RefControl;
 import com.google.gerrit.server.util.IdGenerator;
-import com.google.gwtorm.server.AtomicUpdate;
 import com.google.gwtorm.server.OrmConcurrencyException;
 import com.google.gwtorm.server.OrmException;
 
@@ -321,10 +321,8 @@
       final RefControl refControl, CommitValidators commitValidators,
       final IdentifiedUser user, final String message, final ReviewDb db,
       final CommitMessageEditedSender.Factory commitMessageEditedSenderFactory,
-      final ChangeHooks hooks, Repository git,
-      final PatchSetInfoFactory patchSetInfoFactory,
-      final GitReferenceUpdated gitRefUpdated, PersonIdent myIdent,
-      final TrackingFooters trackingFooters)
+      Repository git, final GitReferenceUpdated gitRefUpdated,
+      PersonIdent myIdent, PatchSetInserter patchSetInserter)
       throws NoSuchChangeException, EmailException, OrmException,
       MissingObjectException, IncorrectObjectTypeException, IOException,
       InvalidChangeOperationException, PatchSetInfoNotAvailableException {
@@ -335,15 +333,18 @@
     }
 
     if (message == null || message.length() == 0) {
-      throw new InvalidChangeOperationException("The commit message cannot be empty");
+      throw new InvalidChangeOperationException(
+          "The commit message cannot be empty");
     }
 
     final RevWalk revWalk = new RevWalk(git);
     try {
       RevCommit commit =
-          revWalk.parseCommit(ObjectId.fromString(originalPS.getRevision().get()));
+          revWalk.parseCommit(ObjectId.fromString(originalPS.getRevision()
+              .get()));
       if (commit.getFullMessage().equals(message)) {
-        throw new InvalidChangeOperationException("New commit message cannot be same as existing commit message");
+        throw new InvalidChangeOperationException(
+            "New commit message cannot be same as existing commit message");
       }
 
       Date now = myIdent.getWhen();
@@ -375,9 +376,6 @@
       newPatchSet.setRevision(new RevId(newCommit.name()));
       newPatchSet.setDraft(originalPS.isDraft());
 
-      final PatchSetInfo info =
-          patchSetInfoFactory.get(newCommit, newPatchSet.getId());
-
       CommitReceivedEvent commitReceivedEvent =
           new CommitReceivedEvent(new ReceiveCommand(ObjectId.zeroId(),
               newCommit.getId(), newPatchSet.getRefName()), refControl
@@ -401,69 +399,13 @@
       }
       gitRefUpdated.fire(change.getProject(), ru);
 
-      db.changes().beginTransaction(change.getId());
-      try {
-        Change updatedChange = db.changes().get(change.getId());
-        if (updatedChange != null && updatedChange.getStatus().isOpen()) {
-          change = updatedChange;
-        } else {
-          throw new InvalidChangeOperationException(String.format(
-              "Change %s is closed", change.getId()));
-        }
+      final String msg =
+          "Patch Set " + newPatchSet.getPatchSetId()
+              + ": Commit message was updated";
 
-        ChangeUtil.insertAncestors(db, newPatchSet.getId(), commit);
-        db.patchSets().insert(Collections.singleton(newPatchSet));
-        updatedChange =
-            db.changes().atomicUpdate(change.getId(), new AtomicUpdate<Change>() {
-              @Override
-              public Change update(Change change) {
-                if (change.getStatus().isClosed()) {
-                  return null;
-                }
-                if (!change.currentPatchSetId().equals(patchSetId)) {
-                  return null;
-                }
-                if (change.getStatus() != Change.Status.DRAFT) {
-                  change.setStatus(Change.Status.NEW);
-                }
-                change.setLastSha1MergeTested(null);
-                change.setCurrentPatchSet(info);
-                ChangeUtil.updated(change);
-                return change;
-              }
-            });
-        if (updatedChange != null) {
-          change = updatedChange;
-        } else {
-          throw new InvalidChangeOperationException(String.format(
-              "Change %s was modified", change.getId()));
-        }
-
-        ApprovalsUtil.copyLabels(db,
-            refControl.getProjectControl().getLabelTypes(),
-            originalPS.getId(),
-            change.currentPatchSetId());
-
-        final List<FooterLine> footerLines = newCommit.getFooterLines();
-        updateTrackingIds(db, change, trackingFooters, footerLines);
-
-        final ChangeMessage cmsg =
-            new ChangeMessage(new ChangeMessage.Key(changeId,
-                ChangeUtil.messageUUID(db)), user.getAccountId(), patchSetId);
-        final String msg = "Patch Set " + newPatchSet.getPatchSetId() + ": Commit message was updated";
-        cmsg.setMessage(msg);
-        db.changeMessages().insert(Collections.singleton(cmsg));
-        db.commit();
-
-        final CommitMessageEditedSender cm = commitMessageEditedSenderFactory.create(change);
-        cm.setFrom(user.getAccountId());
-        cm.setChangeMessage(cmsg);
-        cm.send();
-      } finally {
-        db.rollback();
-      }
-
-      hooks.doPatchsetCreatedHook(change, newPatchSet, db);
+      change =
+          patchSetInserter.insertPatchSet(change, newPatchSet, newCommit,
+              refControl, msg, true);
 
       return change.getId();
     } finally {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
new file mode 100644
index 0000000..3c81121
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -0,0 +1,142 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.change;
+
+import com.google.gerrit.common.ChangeHooks;
+import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.reviewdb.client.ChangeMessage;
+import com.google.gerrit.reviewdb.client.PatchSet;
+import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gerrit.server.ApprovalsUtil;
+import com.google.gerrit.server.ChangeUtil;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.config.TrackingFooters;
+import com.google.gerrit.server.patch.PatchSetInfoFactory;
+import com.google.gerrit.server.project.InvalidChangeOperationException;
+import com.google.gerrit.server.project.NoSuchChangeException;
+import com.google.gerrit.server.project.RefControl;
+import com.google.gwtorm.server.AtomicUpdate;
+import com.google.gwtorm.server.OrmException;
+import com.google.inject.Inject;
+
+import org.eclipse.jgit.revwalk.FooterLine;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import java.util.Collections;
+import java.util.List;
+
+public class PatchSetInserter {
+  private final ChangeHooks hooks;
+  private final TrackingFooters trackingFooters;
+  private final PatchSetInfoFactory patchSetInfoFactory;
+  private final ReviewDb db;
+  private final IdentifiedUser user;
+
+  @Inject
+  public PatchSetInserter(final ChangeHooks hooks,
+      final TrackingFooters trackingFooters, final ReviewDb db,
+      final PatchSetInfoFactory patchSetInfoFactory, final IdentifiedUser user) {
+    this.hooks = hooks;
+    this.trackingFooters = trackingFooters;
+    this.db = db;
+    this.patchSetInfoFactory = patchSetInfoFactory;
+    this.user = user;
+  }
+
+  public Change insertPatchSet(Change change, final PatchSet patchSet,
+      final RevCommit commit, RefControl refControl, String message,
+      boolean copyLabels) throws OrmException, InvalidChangeOperationException,
+      NoSuchChangeException {
+
+    final PatchSet.Id currentPatchSetId = change.currentPatchSetId();
+
+    if (patchSet.getId().get() <= currentPatchSetId.get()) {
+      throw new InvalidChangeOperationException("New Patch Set ID ["
+          + patchSet.getId().get()
+          + "] is not greater than the current Patch Set ID ["
+          + currentPatchSetId.get() + "]");
+    }
+
+    db.changes().beginTransaction(change.getId());
+    try {
+      if (!db.changes().get(change.getId()).getStatus().isOpen()) {
+        throw new InvalidChangeOperationException(String.format(
+            "Change %s is closed", change.getId()));
+      }
+
+      ChangeUtil.insertAncestors(db, patchSet.getId(), commit);
+      db.patchSets().insert(Collections.singleton(patchSet));
+
+      Change updatedChange =
+          db.changes().atomicUpdate(change.getId(), new AtomicUpdate<Change>() {
+            @Override
+            public Change update(Change change) {
+              if (change.getStatus().isClosed()) {
+                return null;
+              }
+              if (!change.currentPatchSetId().equals(currentPatchSetId)) {
+                return null;
+              }
+              if (change.getStatus() != Change.Status.DRAFT) {
+                change.setStatus(Change.Status.NEW);
+              }
+              change.setLastSha1MergeTested(null);
+              change.setCurrentPatchSet(patchSetInfoFactory.get(commit,
+                  patchSet.getId()));
+              ChangeUtil.updated(change);
+              return change;
+            }
+          });
+      if (updatedChange != null) {
+        change = updatedChange;
+      } else {
+        throw new ChangeModifiedException(String.format(
+            "Change %s was modified", change.getId()));
+      }
+
+      if (copyLabels) {
+        ApprovalsUtil.copyLabels(db, refControl.getProjectControl()
+            .getLabelTypes(), currentPatchSetId, change.currentPatchSetId());
+      }
+
+      final List<FooterLine> footerLines = commit.getFooterLines();
+      ChangeUtil.updateTrackingIds(db, change, trackingFooters, footerLines);
+
+      if (message != null) {
+        final ChangeMessage cmsg =
+            new ChangeMessage(new ChangeMessage.Key(change.getId(),
+                ChangeUtil.messageUUID(db)), user.getAccountId(),
+                patchSet.getId());
+
+        cmsg.setMessage(message);
+        db.changeMessages().insert(Collections.singleton(cmsg));
+      }
+      db.commit();
+
+      hooks.doPatchsetCreatedHook(change, patchSet, db);
+    } finally {
+      db.rollback();
+    }
+    return change;
+  }
+
+  public class ChangeModifiedException extends InvalidChangeOperationException {
+    private static final long serialVersionUID = 1L;
+
+    public ChangeModifiedException(String msg) {
+      super(msg);
+    }
+  }
+}