diff --git a/js/helpers.js b/js/helpers.js
index 2589182ac..29446e2fc 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -430,6 +430,10 @@ window.textsecure.storage = function() {
 				textsecure.storage.putEncrypted("groupMembership" + number, membership);
 		}
 
+		self.getGroupListForNumber = function(number) {
+			return textsecure.storage.getEncrypted("groupMembership" + number, []);
+		}
+
 		self.createNewGroup = function(numbers, groupId) {
 			if (groupId === undefined) {
 				while (textsecure.storage.getEncrypted("group" + groupId) !== undefined)
@@ -491,22 +495,6 @@ window.textsecure.storage = function() {
 			return group.numbers;
 		}
 
-		self.addNumber = function(groupId, number) {
-			var group = textsecure.storage.getEncrypted("group" + groupId);
-			if (group === undefined)
-				return undefined;
-
-			if (group.numbers.indexOf(number) > -1)
-				return group.numbers;
-
-			number = textsecure.utils.verifyNumber(number);
-			group.numbers.push(number);
-			addGroupToNumber(groupId, number);
-			textsecure.storage.putEncrypted("group" + groupId, group);
-
-			return group.numbers;
-		}
-
 		self.addNumbers = function(groupId, numbers) {
 			var group = textsecure.storage.getEncrypted("group" + groupId);
 			if (group === undefined)
@@ -514,8 +502,10 @@ window.textsecure.storage = function() {
 
 			for (i in numbers) {
 				var number = textsecure.utils.verifyNumber(numbers[i]);
-				if (group.numbers.indexOf(number) < 0)
+				if (group.numbers.indexOf(number) < 0) {
 					group.numbers.push(number);
+					addGroupToNumber(groupId, number);
+				}
 			}
 
 			textsecure.storage.putEncrypted("group" + groupId, group);
@@ -526,6 +516,14 @@ window.textsecure.storage = function() {
 			textsecure.storage.removeEncrypted("group" + groupId);
 		}
 
+		self.getGroup = function(groupId) {
+			var group = textsecure.storage.getEncrypted("group" + groupId);
+			if (group === undefined)
+				return undefined;
+
+			return { id: groupId, numbers: group.numbers }; //TODO: avatar/name tracking
+		}
+
 		return self;
 	}();
 
diff --git a/js/sendmessage.js b/js/sendmessage.js
index 5e1a48674..00ebb0fd0 100644
--- a/js/sendmessage.js
+++ b/js/sendmessage.js
@@ -63,11 +63,40 @@ window.textsecure.messaging = function() {
 		});
 	}
 
+	var sendGroupProto;
+	var makeAttachmentPointer;
+	var refreshGroups = function(number) {
+		var groups = textsecure.storage.groups.getGroupListForNumber(number);
+		var promises = [];
+		for (i in groups) {
+			var group = textsecure.storage.groups.getGroup(groups[i]);
+
+			var proto = new textsecure.protos.PushMessageContentProtobuf();
+			proto.group = new textsecure.protos.PushMessageContentProtobuf.GroupContext();
+
+			proto.group.id = group.id;
+			proto.group.type = textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE;
+			proto.group.members = group.numbers;
+			proto.group.name = group.name === undefined ? null : group.name;
+
+			if (group.avatar !== undefined) {
+				return makeAttachmentPointer(group.avatar).then(function(attachment) {
+					proto.group.avatar = attachment;
+					promises.push(sendGroupProto([number], proto));
+				});
+			} else {
+				promises.push(sendGroupProto([number], proto));
+			}
+		}
+		return Promise.all(promises);
+	}
+
 	var tryMessageAgain = function(number, encodedMessage, callback) {
 		//TODO: Wipe identity key!
-		//TODO: refresh groups
-		var message = textsecure.protos.decodePushMessageContentProtobuf(encodedMessage);
-		textsecure.sendMessage([number], message, callback);
+		refreshGroups(number).then(function() {
+			var message = textsecure.protos.decodePushMessageContentProtobuf(encodedMessage);
+			textsecure.sendMessage([number], message, callback);
+		});
 	}
 	textsecure.replay.registerReplayFunction(tryMessageAgain, textsecure.replay.SEND_MESSAGE);
 
@@ -95,8 +124,9 @@ window.textsecure.messaging = function() {
 				var devicesForNumber = textsecure.storage.devices.getDeviceObjectsForNumber(number);
 				if (devicesForNumber.length == 0)
 					return registerError(number, "Go empty device list when loading device keys", null);
-				//TODO: Refresh groups
-				doSendMessage(number, devicesForNumber, recurse);
+				refreshGroups(number).then(function() {
+					doSendMessage(number, devicesForNumber, recurse);
+				});
 			}
 		}
 
@@ -144,7 +174,7 @@ window.textsecure.messaging = function() {
 		}
 	}
 
-	var makeAttachmentPointer = function(attachment) {
+	makeAttachmentPointer = function(attachment) {
 		var proto = new textsecure.protos.PushMessageContentProtobuf.AttachmentPointer();
 		proto.key = textsecure.crypto.getRandomBytes(64);
 
@@ -169,7 +199,7 @@ window.textsecure.messaging = function() {
 		});
 	}
 
-	var sendGroupProto = function(numbers, proto) {
+	sendGroupProto = function(numbers, proto) {
 		var me = textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
 		numbers = numbers.filter(function(number) { return number != me; });
 
@@ -232,7 +262,7 @@ window.textsecure.messaging = function() {
 
 		var group = textsecure.storage.groups.createNewGroup(numbers);
 		proto.group.id = group.id;
-		numbers = group.numbers;
+		var numbers = group.numbers;
 
 		proto.group.type = textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE;
 		proto.group.members = numbers;
@@ -258,7 +288,7 @@ window.textsecure.messaging = function() {
 		proto.group.id = groupId;
 		proto.group.type = textsecure.protos.PushMessageContentProtobuf.GroupContext.UPDATE;
 
-		var numbers = textsecure.storage.groups.addNumber(groupId, number);
+		var numbers = textsecure.storage.groups.addNumbers(groupId, [number]);
 		if (numbers === undefined)
 			return new Promise(function(resolve, reject) { reject(new Error("Unknown Group")); });
 		proto.group.members = numbers;