rename classes, no 'New' as pre- or suffix needed anymore

deltachat-ios.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3008CB7224F93EB900E6A617 /* NewAudioMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7124F93EB900E6A617 /* NewAudioMessageCell.swift */; };
-		3008CB7424F9436C00E6A617 /* NewAudioPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7324F9436C00E6A617 /* NewAudioPlayerView.swift */; };
-		3008CB7624F95B6D00E6A617 /* NewAudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7524F95B6D00E6A617 /* NewAudioController.swift */; };
+		3008CB7224F93EB900E6A617 /* AudioMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7124F93EB900E6A617 /* AudioMessageCell.swift */; };
+		3008CB7424F9436C00E6A617 /* AudioPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7324F9436C00E6A617 /* AudioPlayerView.swift */; };
+		3008CB7624F95B6D00E6A617 /* AudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7524F95B6D00E6A617 /* AudioController.swift */; };
 		30149D9322F21129003C12B5 /* QrViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30149D9222F21129003C12B5 /* QrViewController.swift */; };
 		3015634423A003BA00E9DEF4 /* AudioRecorderController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3015634323A003BA00E9DEF4 /* AudioRecorderController.swift */; };
 		3022E6BE22E8768800763272 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3022E6C022E8768800763272 /* InfoPlist.strings */; };
@@ -18,7 +18,7 @@
 		302B84C6239676F0001C261F /* AvatarHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30AC265E237F1807002A943F /* AvatarHelper.swift */; };
 		302B84C72396770B001C261F /* RelayHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302B84C42396627F001C261F /* RelayHelper.swift */; };
 		302B84CE2397F6CD001C261F /* URL+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302B84CD2397F6CD001C261F /* URL+Extension.swift */; };
-		302E1BB4252B5AB4008F4264 /* NewPlayButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302E1BB3252B5AB4008F4264 /* NewPlayButtonView.swift */; };
+		302E1BB4252B5AB4008F4264 /* PlayButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 302E1BB3252B5AB4008F4264 /* PlayButtonView.swift */; };
 		304219D3243F588500516852 /* DcCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 304219D1243F588500516852 /* DcCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		304219D92440734A00516852 /* DcMsg+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 304219D82440734A00516852 /* DcMsg+Extension.swift */; };
 		304F5E44244F571C00462538 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A9FB14A1FB061E2001FEA36 /* Assets.xcassets */; };
@@ -45,12 +45,12 @@
 		30734326249A280B00BF9AD1 /* MediaQualityController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30734325249A280B00BF9AD1 /* MediaQualityController.swift */; };
 		307D822E241669C7006D2490 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 307D822D241669C7006D2490 /* LocationManager.swift */; };
 		3095A351237DD1F700AB07F7 /* MediaPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3095A350237DD1F700AB07F7 /* MediaPicker.swift */; };
-		30A4149724F6EFBE00EC91EB /* NewInfoMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A4149624F6EFBE00EC91EB /* NewInfoMessageCell.swift */; };
+		30A4149724F6EFBE00EC91EB /* InfoMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30A4149624F6EFBE00EC91EB /* InfoMessageCell.swift */; };
 		30B0ACFA24AB5B99004D5E29 /* SettingsEphemeralMessageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30B0ACF924AB5B99004D5E29 /* SettingsEphemeralMessageController.swift */; };
 		30C0D49D237C4908008E2A0E /* CertificateCheckController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C0D49C237C4908008E2A0E /* CertificateCheckController.swift */; };
 		30E348DF24F3F819005C93D1 /* ChatTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E348DE24F3F819005C93D1 /* ChatTableView.swift */; };
-		30E348E124F53772005C93D1 /* NewImageTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E348E024F53772005C93D1 /* NewImageTextCell.swift */; };
-		30E348E524F6647D005C93D1 /* NewFileTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E348E424F6647D005C93D1 /* NewFileTextCell.swift */; };
+		30E348E124F53772005C93D1 /* ImageTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E348E024F53772005C93D1 /* ImageTextCell.swift */; };
+		30E348E524F6647D005C93D1 /* FileTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E348E424F6647D005C93D1 /* FileTextCell.swift */; };
 		30E8F2132447285600CE2C90 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2122447285600CE2C90 /* ShareViewController.swift */; };
 		30E8F2162447285600CE2C90 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 30E8F2142447285600CE2C90 /* MainInterface.storyboard */; };
 		30E8F21A2447285600CE2C90 /* Delta Chat.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 30E8F2102447285600CE2C90 /* Delta Chat.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -60,11 +60,11 @@
 		30E8F2512449EA0E00CE2C90 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3060119E22DDE24000C1CE6F /* Localizable.strings */; };
 		30E8F253244DAD0E00CE2C90 /* SendingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F252244DAD0E00CE2C90 /* SendingController.swift */; };
 		30EF7308252F6A3300E2C54A /* PaddingTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F4BFED252E3E020006B9B3 /* PaddingTextView.swift */; };
-		30EF7324252FF15F00E2C54A /* NewMessageLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EF7323252FF15F00E2C54A /* NewMessageLabel.swift */; };
+		30EF7324252FF15F00E2C54A /* MessageLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30EF7323252FF15F00E2C54A /* MessageLabel.swift */; };
 		30F8817624DA97DA0023780E /* BackgroundContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F8817524DA97DA0023780E /* BackgroundContainer.swift */; };
 		30F9B9EC235F2116006E7ACF /* MessageCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30F9B9EB235F2116006E7ACF /* MessageCounter.swift */; };
-		30FDB70524D1C1000066C48D /* ChatViewControllerNew.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */; };
-		30FDB71F24D8170E0066C48D /* NewTextMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */; };
+		30FDB70524D1C1000066C48D /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB6F824D1C1000066C48D /* ChatViewController.swift */; };
+		30FDB71F24D8170E0066C48D /* TextMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB71E24D8170E0066C48D /* TextMessageCell.swift */; };
 		30FDB72124D838240066C48D /* BaseMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FDB72024D838240066C48D /* BaseMessageCell.swift */; };
 		451CF971F08D38BCECADCB45 /* Pods_deltachat_ios_DcShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 546063D4BFB8FD920C4EAA22 /* Pods_deltachat_ios_DcShare.framework */; };
 		6795F63A82E94FF7CD2CEC0F /* Pods_deltachat_iosTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F7009234DB9408201A6CDCB /* Pods_deltachat_iosTests.framework */; };
@@ -182,9 +182,9 @@
 /* Begin PBXFileReference section */
 		21EE28844E7A690D73BF5285 /* Pods-deltachat-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-iosTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.debug.xcconfig"; sourceTree = "<group>"; };
 		2F7009234DB9408201A6CDCB /* Pods_deltachat_iosTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_iosTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		3008CB7124F93EB900E6A617 /* NewAudioMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewAudioMessageCell.swift; sourceTree = "<group>"; };
-		3008CB7324F9436C00E6A617 /* NewAudioPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewAudioPlayerView.swift; sourceTree = "<group>"; };
-		3008CB7524F95B6D00E6A617 /* NewAudioController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewAudioController.swift; sourceTree = "<group>"; };
+		3008CB7124F93EB900E6A617 /* AudioMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMessageCell.swift; sourceTree = "<group>"; };
+		3008CB7324F9436C00E6A617 /* AudioPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerView.swift; sourceTree = "<group>"; };
+		3008CB7524F95B6D00E6A617 /* AudioController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioController.swift; sourceTree = "<group>"; };
 		30149D9222F21129003C12B5 /* QrViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrViewController.swift; sourceTree = "<group>"; };
 		3015634323A003BA00E9DEF4 /* AudioRecorderController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRecorderController.swift; sourceTree = "<group>"; };
 		3022E6BF22E8768800763272 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -211,7 +211,7 @@
 		30260CA6238F02F700D8D52C /* MultilineTextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextFieldCell.swift; sourceTree = "<group>"; };
 		302B84C42396627F001C261F /* RelayHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayHelper.swift; sourceTree = "<group>"; };
 		302B84CD2397F6CD001C261F /* URL+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Extension.swift"; sourceTree = "<group>"; };
-		302E1BB3252B5AB4008F4264 /* NewPlayButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NewPlayButtonView.swift; path = "deltachat-ios/Chat/Views/NewPlayButtonView.swift"; sourceTree = SOURCE_ROOT; };
+		302E1BB3252B5AB4008F4264 /* PlayButtonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PlayButtonView.swift; path = "deltachat-ios/Chat/Views/PlayButtonView.swift"; sourceTree = SOURCE_ROOT; };
 		304219D1243F588500516852 /* DcCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DcCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		304219D82440734A00516852 /* DcMsg+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DcMsg+Extension.swift"; sourceTree = "<group>"; };
 		3052C609253F082E007D13EA /* MessageLabelDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLabelDelegate.swift; sourceTree = "<group>"; };
@@ -271,13 +271,13 @@
 		30734325249A280B00BF9AD1 /* MediaQualityController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaQualityController.swift; sourceTree = "<group>"; };
 		307D822D241669C7006D2490 /* LocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = "<group>"; };
 		3095A350237DD1F700AB07F7 /* MediaPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPicker.swift; sourceTree = "<group>"; };
-		30A4149624F6EFBE00EC91EB /* NewInfoMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewInfoMessageCell.swift; sourceTree = "<group>"; };
+		30A4149624F6EFBE00EC91EB /* InfoMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoMessageCell.swift; sourceTree = "<group>"; };
 		30AC265E237F1807002A943F /* AvatarHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarHelper.swift; sourceTree = "<group>"; };
 		30B0ACF924AB5B99004D5E29 /* SettingsEphemeralMessageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsEphemeralMessageController.swift; sourceTree = "<group>"; };
 		30C0D49C237C4908008E2A0E /* CertificateCheckController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CertificateCheckController.swift; sourceTree = "<group>"; };
 		30E348DE24F3F819005C93D1 /* ChatTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatTableView.swift; sourceTree = "<group>"; };
-		30E348E024F53772005C93D1 /* NewImageTextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewImageTextCell.swift; sourceTree = "<group>"; };
-		30E348E424F6647D005C93D1 /* NewFileTextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewFileTextCell.swift; sourceTree = "<group>"; };
+		30E348E024F53772005C93D1 /* ImageTextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageTextCell.swift; sourceTree = "<group>"; };
+		30E348E424F6647D005C93D1 /* FileTextCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileTextCell.swift; sourceTree = "<group>"; };
 		30E8F2102447285600CE2C90 /* Delta Chat.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Delta Chat.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		30E8F2122447285600CE2C90 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		30E8F2152447285600CE2C90 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
@@ -286,12 +286,12 @@
 		30E8F2412448B77600CE2C90 /* ChatListController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListController.swift; sourceTree = "<group>"; };
 		30E8F2432449C64100CE2C90 /* ChatListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListCell.swift; sourceTree = "<group>"; };
 		30E8F252244DAD0E00CE2C90 /* SendingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendingController.swift; sourceTree = "<group>"; };
-		30EF7323252FF15F00E2C54A /* NewMessageLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewMessageLabel.swift; sourceTree = "<group>"; };
+		30EF7323252FF15F00E2C54A /* MessageLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageLabel.swift; sourceTree = "<group>"; };
 		30F4BFED252E3E020006B9B3 /* PaddingTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaddingTextView.swift; sourceTree = "<group>"; };
 		30F8817524DA97DA0023780E /* BackgroundContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundContainer.swift; sourceTree = "<group>"; };
 		30F9B9EB235F2116006E7ACF /* MessageCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCounter.swift; sourceTree = "<group>"; };
-		30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewControllerNew.swift; sourceTree = "<group>"; };
-		30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTextMessageCell.swift; sourceTree = "<group>"; };
+		30FDB6F824D1C1000066C48D /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
+		30FDB71E24D8170E0066C48D /* TextMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMessageCell.swift; sourceTree = "<group>"; };
 		30FDB72024D838240066C48D /* BaseMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseMessageCell.swift; sourceTree = "<group>"; };
 		546063D4BFB8FD920C4EAA22 /* Pods_deltachat_ios_DcShare.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios_DcShare.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6241BE1534A653E79AD5D01D /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -352,7 +352,6 @@
 		AEA0F6A024474146009F887B /* ProfileInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileInfoViewController.swift; sourceTree = "<group>"; };
 		AEACE2E21FB32B5C00DCDD78 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		AEACE2E41FB32E1900DCDD78 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
-		AEB54C7E246DBA610004624C /* FlexLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlexLabel.swift; sourceTree = "<group>"; };
 		AEC67A1B241CE9E4007DDBE1 /* AppStateRestorer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateRestorer.swift; sourceTree = "<group>"; };
 		AEC67A1D241FCFE0007DDBE1 /* ChatListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListViewModel.swift; sourceTree = "<group>"; };
 		AECEF03D244F2D55006C90DA /* QrPageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrPageController.swift; sourceTree = "<group>"; };
@@ -518,8 +517,8 @@
 		30FDB6B224D18E390066C48D /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				3008CB7524F95B6D00E6A617 /* NewAudioController.swift */,
-				30FDB6F824D1C1000066C48D /* ChatViewControllerNew.swift */,
+				3008CB7524F95B6D00E6A617 /* AudioController.swift */,
+				30FDB6F824D1C1000066C48D /* ChatViewController.swift */,
 				30FDB6B524D193DD0066C48D /* Views */,
 			);
 			path = Chat;
@@ -530,10 +529,10 @@
 			children = (
 				30FDB6B624D193DD0066C48D /* Cells */,
 				30E348DE24F3F819005C93D1 /* ChatTableView.swift */,
-				302E1BB3252B5AB4008F4264 /* NewPlayButtonView.swift */,
+				302E1BB3252B5AB4008F4264 /* PlayButtonView.swift */,
 				30F8817524DA97DA0023780E /* BackgroundContainer.swift */,
-				3008CB7324F9436C00E6A617 /* NewAudioPlayerView.swift */,
-				30EF7323252FF15F00E2C54A /* NewMessageLabel.swift */,
+				3008CB7324F9436C00E6A617 /* AudioPlayerView.swift */,
+				30EF7323252FF15F00E2C54A /* MessageLabel.swift */,
 				3052C609253F082E007D13EA /* MessageLabelDelegate.swift */,
 				3052C60D253F088E007D13EA /* DetectorType.swift */,
 			);
@@ -543,12 +542,12 @@
 		30FDB6B624D193DD0066C48D /* Cells */ = {
 			isa = PBXGroup;
 			children = (
-				30FDB71E24D8170E0066C48D /* NewTextMessageCell.swift */,
+				30FDB71E24D8170E0066C48D /* TextMessageCell.swift */,
 				30FDB72024D838240066C48D /* BaseMessageCell.swift */,
-				30E348E024F53772005C93D1 /* NewImageTextCell.swift */,
-				30E348E424F6647D005C93D1 /* NewFileTextCell.swift */,
-				30A4149624F6EFBE00EC91EB /* NewInfoMessageCell.swift */,
-				3008CB7124F93EB900E6A617 /* NewAudioMessageCell.swift */,
+				30E348E024F53772005C93D1 /* ImageTextCell.swift */,
+				30E348E424F6647D005C93D1 /* FileTextCell.swift */,
+				30A4149624F6EFBE00EC91EB /* InfoMessageCell.swift */,
+				3008CB7124F93EB900E6A617 /* AudioMessageCell.swift */,
 			);
 			path = Cells;
 			sourceTree = "<group>";
@@ -751,10 +750,10 @@
 		AE851AC3227C695900ED86F0 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				AE406EEE240FA454005F7022 /* Cell */,
 				3057029C24C6442800D84EFC /* FlexLabel.swift */,
 				3057029A24C6441300D84EFC /* EmptyStateLabel.swift */,
 				AEF53BD4248904BF00D309C1 /* GalleryTimeLabel.swift */,
-				AE406EEE240FA454005F7022 /* Cell */,
 				B26B3BC6236DC3DC008ED35A /* SwitchCell.swift */,
 				70B8882D2091B8550074812E /* ContactCell.swift */,
 				78ED839321D5AF8A00243125 /* QrCodeView.swift */,
@@ -768,7 +767,6 @@
 				30F9B9EB235F2116006E7ACF /* MessageCounter.swift */,
 				305FE03523A81B4C0053BE90 /* EmptyStateLabel.swift */,
 				AEFBE22E23FEF23D0045327A /* ProviderInfoCell.swift */,
-				AEB54C7E246DBA610004624C /* FlexLabel.swift */,
 				AED62BCD247687E6009E220D /* LocationStreamingIndicator.swift */,
 				30F4BFED252E3E020006B9B3 /* PaddingTextView.swift */,
 			);
@@ -1149,7 +1147,7 @@
 				78ED839421D5AF8A00243125 /* QrCodeView.swift in Sources */,
 				3059620E234614E700C80F33 /* DcContact+Extension.swift in Sources */,
 				AED423D7249F580700B6B2BB /* BlockedContactsViewController.swift in Sources */,
-				3008CB7424F9436C00E6A617 /* NewAudioPlayerView.swift in Sources */,
+				3008CB7424F9436C00E6A617 /* AudioPlayerView.swift in Sources */,
 				AED62BCE247687E6009E220D /* LocationStreamingIndicator.swift in Sources */,
 				AE9DAF0F22C278C6004C9591 /* ChatTitleView.swift in Sources */,
 				AE4AEE3522B1030D000AA495 /* PreviewController.swift in Sources */,
@@ -1159,7 +1157,7 @@
 				78E45E4421D3F14A00D4B15E /* UIImage+Extension.swift in Sources */,
 				30734326249A280B00BF9AD1 /* MediaQualityController.swift in Sources */,
 				AE6EC5282497B9B200A400E4 /* ThumbnailCache.swift in Sources */,
-				30FDB70524D1C1000066C48D /* ChatViewControllerNew.swift in Sources */,
+				30FDB70524D1C1000066C48D /* ChatViewController.swift in Sources */,
 				3057029D24C6442800D84EFC /* FlexLabel.swift in Sources */,
 				AE52EA20229EB9F000C586C9 /* EditGroupViewController.swift in Sources */,
 				AE18F294228C602A0007B1BE /* SecuritySettingsController.swift in Sources */,
@@ -1168,20 +1166,20 @@
 				3095A351237DD1F700AB07F7 /* MediaPicker.swift in Sources */,
 				B21005DB23383664004C70C5 /* SettingsClassicViewController.swift in Sources */,
 				AEC67A1C241CE9E4007DDBE1 /* AppStateRestorer.swift in Sources */,
-				3008CB7224F93EB900E6A617 /* NewAudioMessageCell.swift in Sources */,
-				302E1BB4252B5AB4008F4264 /* NewPlayButtonView.swift in Sources */,
+				3008CB7224F93EB900E6A617 /* AudioMessageCell.swift in Sources */,
+				302E1BB4252B5AB4008F4264 /* PlayButtonView.swift in Sources */,
 				7AE0A5491FC42F65005ECB4B /* NewChatViewController.swift in Sources */,
 				AE77838F23E4276D0093EABD /* ContactCellViewModel.swift in Sources */,
 				B20462E62440C99600367A57 /* SettingsAutodelSetController.swift in Sources */,
 				3015634423A003BA00E9DEF4 /* AudioRecorderController.swift in Sources */,
 				AE25F09022807AD800CDEA66 /* AvatarSelectionCell.swift in Sources */,
-				30A4149724F6EFBE00EC91EB /* NewInfoMessageCell.swift in Sources */,
+				30A4149724F6EFBE00EC91EB /* InfoMessageCell.swift in Sources */,
 				302B84C6239676F0001C261F /* AvatarHelper.swift in Sources */,
 				AE77838D23E32ED20093EABD /* ContactDetailViewModel.swift in Sources */,
 				AEE6EC3F2282C59C00EDC689 /* GroupMembersViewController.swift in Sources */,
 				B26B3BC7236DC3DC008ED35A /* SwitchCell.swift in Sources */,
 				AEE700252438E0E500D6992E /* ProgressAlertHandler.swift in Sources */,
-				30E348E524F6647D005C93D1 /* NewFileTextCell.swift in Sources */,
+				30E348E524F6647D005C93D1 /* FileTextCell.swift in Sources */,
 				306C32322445CDE9001D89F3 /* DcLogger.swift in Sources */,
 				78E45E3A21D3CFBC00D4B15E /* SettingsController.swift in Sources */,
 				AE8519EA2272FDCA00ED86F0 /* DeviceContactsHandler.swift in Sources */,
@@ -1199,8 +1197,8 @@
 				AEE6EC482283045D00EDC689 /* EditSettingsController.swift in Sources */,
 				30E348DF24F3F819005C93D1 /* ChatTableView.swift in Sources */,
 				30EF7308252F6A3300E2C54A /* PaddingTextView.swift in Sources */,
-				30E348E124F53772005C93D1 /* NewImageTextCell.swift in Sources */,
-				3008CB7624F95B6D00E6A617 /* NewAudioController.swift in Sources */,
+				30E348E124F53772005C93D1 /* ImageTextCell.swift in Sources */,
+				3008CB7624F95B6D00E6A617 /* AudioController.swift in Sources */,
 				302B84CE2397F6CD001C261F /* URL+Extension.swift in Sources */,
 				7A9FB1441FB061E2001FEA36 /* AppDelegate.swift in Sources */,
 				AE76E5EE242BF2EA003CF461 /* WelcomeViewController.swift in Sources */,
@@ -1213,7 +1211,7 @@
 				AEACE2E51FB32E1900DCDD78 /* Utils.swift in Sources */,
 				3052C60E253F088E007D13EA /* DetectorType.swift in Sources */,
 				AEC67A1E241FCFE0007DDBE1 /* ChatListViewModel.swift in Sources */,
-				30FDB71F24D8170E0066C48D /* NewTextMessageCell.swift in Sources */,
+				30FDB71F24D8170E0066C48D /* TextMessageCell.swift in Sources */,
 				AE1988A523EB2FBA00B4CD5F /* Errors.swift in Sources */,
 				AEFBE22F23FEF23D0045327A /* ProviderInfoCell.swift in Sources */,
 				AE6EC5242497663200A400E4 /* UIImageView+Extensions.swift in Sources */,
@@ -1227,7 +1225,7 @@
 				30260CA7238F02F700D8D52C /* MultilineTextFieldCell.swift in Sources */,
 				70B8882E2091B8550074812E /* ContactCell.swift in Sources */,
 				305961CD2346125100C80F33 /* UIEdgeInsets+Extensions.swift in Sources */,
-				30EF7324252FF15F00E2C54A /* NewMessageLabel.swift in Sources */,
+				30EF7324252FF15F00E2C54A /* MessageLabel.swift in Sources */,
 				30C0D49D237C4908008E2A0E /* CertificateCheckController.swift in Sources */,
 				7092474120B3869500AF8799 /* ContactDetailViewController.swift in Sources */,
 				30F9B9EC235F2116006E7ACF /* MessageCounter.swift in Sources */,

deltachat-ios/Chat/NewAudioController.swift → deltachat-ios/Chat/AudioController.swift

@@ -15,9 +15,9 @@ public enum PlayerState {
     case stopped
 }
 
-/// The `NewAudioController` update UI for current audio cell that is playing a sound
+/// The `AudioController` update UI for current audio cell that is playing a sound
 /// and also creates and manage an `AVAudioPlayer` states, play, pause and stop.
-open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageCellDelegate {
+open class AudioController: NSObject, AVAudioPlayerDelegate, AudioMessageCellDelegate {
 
     lazy var audioSession: AVAudioSession = {
         let audioSession = AVAudioSession.sharedInstance()
@@ -29,7 +29,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
     open var audioPlayer: AVAudioPlayer?
 
     /// The `AudioMessageCell` that is currently playing sound
-    open weak var playingCell: NewAudioMessageCell?
+    open weak var playingCell: AudioMessageCell?
 
     /// The `MessageType` that is currently playing sound
     open var playingMessage: DcMsg?
@@ -69,7 +69,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
     ///
     /// - Note:
     ///   This protocol method is called by MessageKit every time an audio cell needs to be configure
-    func update(_ cell: NewAudioMessageCell, with messageId: Int) {
+    func update(_ cell: AudioMessageCell, with messageId: Int) {
         cell.delegate = self
         if playingMessage?.id == messageId, let player = audioPlayer {
             playingCell = cell
@@ -79,7 +79,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
         }
     }
 
-    public func playButtonTapped(cell: NewAudioMessageCell, messageId: Int) {
+    public func playButtonTapped(cell: AudioMessageCell, messageId: Int) {
             let message = DcMsg(id: messageId)
             guard state != .stopped else {
                 // There is no audio sound playing - prepare to start playing for given audio message
@@ -105,7 +105,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
     /// - Parameters:
     ///   - message: The `DcMsg` that contain the audio item to be played.
     ///   - audioCell: The `NewAudioMessageCell` that needs to be updated while audio is playing.
-    open func playSound(for message: DcMsg, in audioCell: NewAudioMessageCell) {
+    open func playSound(for message: DcMsg, in audioCell: AudioMessageCell) {
         if message.type == DC_MSG_AUDIO || message.type == DC_MSG_VOICE {
             _ = try? audioSession.setActive(true)
             playingCell = audioCell
@@ -129,7 +129,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
     /// - Parameters:
     ///   - message: The `MessageType` that contain the audio item to be pause.
     ///   - audioCell: The `AudioMessageCell` that needs to be updated by the pause action.
-    open func pauseSound(in audioCell: NewAudioMessageCell) {
+    open func pauseSound(in audioCell: AudioMessageCell) {
         audioPlayer?.pause()
         state = .pause
         audioCell.audioPlayerView.showPlayLayout(false) // show play button on audio cell
@@ -183,7 +183,7 @@ open class NewAudioController: NSObject, AVAudioPlayerDelegate, NewAudioMessageC
         progressTimer = nil
         progressTimer = Timer.scheduledTimer(timeInterval: 0.1,
                                              target: self,
-                                             selector: #selector(NewAudioController.didFireProgressTimer(_:)),
+                                             selector: #selector(AudioController.didFireProgressTimer(_:)),
                                              userInfo: nil,
                                              repeats: true)
     }

deltachat-ios/Chat/ChatViewControllerNew.swift → deltachat-ios/Chat/ChatViewController.swift

@@ -6,7 +6,7 @@ import AVFoundation
 import DcCore
 import SDWebImage
 
-class ChatViewControllerNew: UITableViewController {
+class ChatViewController: UITableViewController {
     var dcContext: DcContext
     let outgoingAvatarOverlap: CGFloat = 17.5
     let loadCount = 30
@@ -81,7 +81,7 @@ class ChatViewControllerNew: UITableViewController {
     }()
 
     /// The `BasicAudioController` controll the AVAudioPlayer state (play, pause, stop) and update audio cell UI accordingly.
-    private lazy var audioController = NewAudioController(dcContext: dcContext, chatId: chatId)
+    private lazy var audioController = AudioController(dcContext: dcContext, chatId: chatId)
 
     private var disableWriting: Bool
     private var showNamesAboveMessage: Bool
@@ -120,11 +120,11 @@ class ChatViewControllerNew: UITableViewController {
     }
 
     override func viewDidLoad() {
-        tableView.register(NewTextMessageCell.self, forCellReuseIdentifier: "text")
-        tableView.register(NewImageTextCell.self, forCellReuseIdentifier: "image")
-        tableView.register(NewFileTextCell.self, forCellReuseIdentifier: "file")
-        tableView.register(NewInfoMessageCell.self, forCellReuseIdentifier: "info")
-        tableView.register(NewAudioMessageCell.self, forCellReuseIdentifier: "audio")
+        tableView.register(TextMessageCell.self, forCellReuseIdentifier: "text")
+        tableView.register(ImageTextCell.self, forCellReuseIdentifier: "image")
+        tableView.register(FileTextCell.self, forCellReuseIdentifier: "file")
+        tableView.register(InfoMessageCell.self, forCellReuseIdentifier: "info")
+        tableView.register(AudioMessageCell.self, forCellReuseIdentifier: "audio")
         tableView.rowHeight = UITableView.automaticDimension
         tableView.separatorStyle = .none
         super.viewDidLoad()
@@ -337,28 +337,28 @@ class ChatViewControllerNew: UITableViewController {
         let message = DcMsg(id: id)
 
         if message.isInfo {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "info", for: indexPath) as? NewInfoMessageCell ?? NewInfoMessageCell()
+            let cell = tableView.dequeueReusableCell(withIdentifier: "info", for: indexPath) as? InfoMessageCell ?? InfoMessageCell()
             cell.update(msg: message)
             return cell
         }
 
         let cell: BaseMessageCell
         if message.type == DC_MSG_IMAGE || message.type == DC_MSG_GIF || message.type == DC_MSG_VIDEO {
-            cell = tableView.dequeueReusableCell(withIdentifier: "image", for: indexPath) as? NewImageTextCell ?? NewImageTextCell()
+            cell = tableView.dequeueReusableCell(withIdentifier: "image", for: indexPath) as? ImageTextCell ?? ImageTextCell()
         } else if message.type == DC_MSG_FILE {
             if message.isSetupMessage {
-                cell = tableView.dequeueReusableCell(withIdentifier: "text", for: indexPath) as? NewTextMessageCell ?? NewTextMessageCell()
+                cell = tableView.dequeueReusableCell(withIdentifier: "text", for: indexPath) as? TextMessageCell ?? TextMessageCell()
                 message.text = String.localized("autocrypt_asm_click_body")
             } else {
-                cell = tableView.dequeueReusableCell(withIdentifier: "file", for: indexPath) as? NewFileTextCell ?? NewFileTextCell()
+                cell = tableView.dequeueReusableCell(withIdentifier: "file", for: indexPath) as? FileTextCell ?? FileTextCell()
             }
         } else if message.type == DC_MSG_AUDIO ||  message.type == DC_MSG_VOICE {
-            let audioMessageCell: NewAudioMessageCell = tableView.dequeueReusableCell(withIdentifier: "audio",
-                                                                                      for: indexPath) as? NewAudioMessageCell ?? NewAudioMessageCell()
+            let audioMessageCell: AudioMessageCell = tableView.dequeueReusableCell(withIdentifier: "audio",
+                                                                                      for: indexPath) as? AudioMessageCell ?? AudioMessageCell()
             audioController.update(audioMessageCell, with: message.id)
             cell = audioMessageCell
         } else {
-            cell = tableView.dequeueReusableCell(withIdentifier: "text", for: indexPath) as? NewTextMessageCell ?? NewTextMessageCell()
+            cell = tableView.dequeueReusableCell(withIdentifier: "text", for: indexPath) as? TextMessageCell ?? TextMessageCell()
         }
 
         cell.baseDelegate = self
@@ -1067,7 +1067,7 @@ class ChatViewControllerNew: UITableViewController {
 }
 
 // MARK: - BaseMessageCellDelegate
-extension ChatViewControllerNew: BaseMessageCellDelegate {
+extension ChatViewController: BaseMessageCellDelegate {
 
     @objc func textTapped(indexPath: IndexPath) {
         _ = handleUIMenu()
@@ -1108,7 +1108,7 @@ extension ChatViewControllerNew: BaseMessageCellDelegate {
 }
 
 // MARK: - MediaPickerDelegate
-extension ChatViewControllerNew: MediaPickerDelegate {
+extension ChatViewController: MediaPickerDelegate {
     func onVideoSelected(url: NSURL) {
         sendVideo(url: url)
     }
@@ -1132,7 +1132,7 @@ extension ChatViewControllerNew: MediaPickerDelegate {
 }
 
 // MARK: - MessageInputBarDelegate
-extension ChatViewControllerNew: InputBarAccessoryViewDelegate {
+extension ChatViewController: InputBarAccessoryViewDelegate {
     func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
         if inputBar.inputTextView.images.isEmpty {
             self.sendTextMessage(message: text.trimmingCharacters(in: .whitespacesAndNewlines))

deltachat-ios/Chat/Views/NewAudioPlayerView.swift → deltachat-ios/Chat/Views/AudioPlayerView.swift

@@ -1,7 +1,7 @@
 import Foundation
 import UIKit
 
-open class NewAudioPlayerView: UIView {
+open class AudioPlayerView: UIView {
 
     /// The play button view to display on audio messages.
     lazy var playButton: UIButton = {

deltachat-ios/Chat/Views/Cells/NewAudioMessageCell.swift → deltachat-ios/Chat/Views/Cells/AudioMessageCell.swift

@@ -3,16 +3,16 @@ import DcCore
 
 // NewAudioMessageCellDelegate is for sending events to NewAudioController.
 // do not confuse with BaseMessageCellDelegate that is for sending events to ChatViewControllerNew.
-public protocol NewAudioMessageCellDelegate: AnyObject {
-    func playButtonTapped(cell: NewAudioMessageCell, messageId: Int)
+public protocol AudioMessageCellDelegate: AnyObject {
+    func playButtonTapped(cell: AudioMessageCell, messageId: Int)
 }
 
-public class NewAudioMessageCell: BaseMessageCell {
+public class AudioMessageCell: BaseMessageCell {
 
-    public weak var delegate: NewAudioMessageCellDelegate?
+    public weak var delegate: AudioMessageCellDelegate?
 
-    lazy var audioPlayerView: NewAudioPlayerView = {
-        let view = NewAudioPlayerView()
+    lazy var audioPlayerView: AudioPlayerView = {
+        let view = AudioPlayerView()
         view.translatesAutoresizingMaskIntoConstraints = false
         return view
     }()

deltachat-ios/Chat/Views/Cells/NewFileTextCell.swift → deltachat-ios/Chat/Views/Cells/FileTextCell.swift

@@ -3,7 +3,7 @@ import UIKit
 import DcCore
 import SDWebImage
 
-class NewFileTextCell: BaseMessageCell {
+class FileTextCell: BaseMessageCell {
 
     private lazy var defaultImage: UIImage = {
         let image = UIImage(named: "ic_attach_file_36pt")

deltachat-ios/Chat/Views/Cells/NewImageTextCell.swift → deltachat-ios/Chat/Views/Cells/ImageTextCell.swift

@@ -3,7 +3,7 @@ import UIKit
 import DcCore
 import SDWebImage
 
-class NewImageTextCell: BaseMessageCell {
+class ImageTextCell: BaseMessageCell {
 
     var imageHeightConstraint: NSLayoutConstraint?
     var imageWidthConstraint: NSLayoutConstraint?
@@ -19,8 +19,8 @@ class NewImageTextCell: BaseMessageCell {
     }()
 
     /// The play button view to display on video messages.
-    open lazy var playButtonView: NewPlayButtonView = {
-        let playButtonView = NewPlayButtonView()
+    open lazy var playButtonView: PlayButtonView = {
+        let playButtonView = PlayButtonView()
         playButtonView.isHidden = true
         translatesAutoresizingMaskIntoConstraints = false
         return playButtonView

deltachat-ios/Chat/Views/Cells/NewInfoMessageCell.swift → deltachat-ios/Chat/Views/Cells/InfoMessageCell.swift

@@ -1,7 +1,7 @@
 import UIKit
 import DcCore
 
-class NewInfoMessageCell: UITableViewCell {
+class InfoMessageCell: UITableViewCell {
 
     private lazy var messageBackgroundContainer: BackgroundContainer = {
         let container = BackgroundContainer()

deltachat-ios/Chat/Views/Cells/NewTextMessageCell.swift → deltachat-ios/Chat/Views/Cells/TextMessageCell.swift

@@ -2,7 +2,7 @@ import Foundation
 import DcCore
 import UIKit
 
-class NewTextMessageCell: BaseMessageCell {
+class TextMessageCell: BaseMessageCell {
 
     override func setupSubviews() {
         super.setupSubviews()

deltachat-ios/Chat/Views/DetectorType.swift

@@ -75,4 +75,3 @@ public enum DetectorType: Hashable {
     }
 
 }
-

deltachat-ios/Chat/Views/NewMessageLabel.swift → deltachat-ios/Chat/Views/MessageLabel.swift

@@ -24,7 +24,7 @@
 
 import UIKit
 
-open class NewMessageLabel: UILabel {
+open class MessageLabel: UILabel {
 
     // MARK: - Private Properties
 
@@ -300,7 +300,7 @@ open class NewMessageLabel: UILabel {
         case .hashtag:
             return hashtagAttributes
         case .custom(let regex):
-            return customAttributes[regex] ?? NewMessageLabel.defaultAttributes
+            return customAttributes[regex] ?? MessageLabel.defaultAttributes
         }
 
     }

deltachat-ios/Chat/Views/MessageLabelDelegate.swift

@@ -97,4 +97,3 @@ public extension MessageLabelDelegate {
     func didSelectCustom(_ pattern: String, match: String?) {}
 
 }
-

deltachat-ios/Chat/Views/NewPlayButtonView.swift → deltachat-ios/Chat/Views/PlayButtonView.swift

@@ -24,7 +24,7 @@
 
 import UIKit
 
-open class NewPlayButtonView: UIView {
+open class PlayButtonView: UIView {
 
     // MARK: - Properties
 

deltachat-ios/Controller/ChatListController.swift

@@ -403,7 +403,7 @@ class ChatListController: UITableViewController {
 
     func showChat(chatId: Int, animated: Bool = true) {
         //let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
-        let chatVC = ChatViewControllerNew(dcContext: dcContext, chatId: chatId)
+        let chatVC = ChatViewController(dcContext: dcContext, chatId: chatId)
         navigationController?.pushViewController(chatVC, animated: animated)
     }
 

deltachat-ios/Controller/ContactDetailViewController.swift

@@ -370,7 +370,7 @@ class ContactDetailViewController: UITableViewController {
     // MARK: - coordinator
     private func showChat(chatId: Int) {
         if let chatlistViewController = navigationController?.viewControllers[0] {
-            let chatViewController = ChatViewControllerNew(dcContext: viewModel.context, chatId: chatId)
+            let chatViewController = ChatViewController(dcContext: viewModel.context, chatId: chatId)
             navigationController?.setViewControllers([chatlistViewController, chatViewController], animated: true)
         }
     }

deltachat-ios/Controller/MailboxViewController.swift

@@ -1,7 +1,7 @@
 import UIKit
 import DcCore
 
-class MailboxViewController: ChatViewControllerNew {
+class MailboxViewController: ChatViewController {
 
     override init(dcContext: DcContext, chatId: Int) {
         super.init(dcContext: dcContext, chatId: chatId)

deltachat-ios/Controller/NewChatViewController.swift

@@ -318,7 +318,7 @@ class NewChatViewController: UITableViewController {
     }
 
     private func showChat(chatId: Int) {
-        let chatViewController = ChatViewControllerNew(dcContext: dcContext, chatId: chatId)
+        let chatViewController = ChatViewController(dcContext: dcContext, chatId: chatId)
         navigationController?.pushViewController(chatViewController, animated: true)
         navigationController?.viewControllers.remove(at: 1)
     }

deltachat-ios/Controller/NewContactController.swift

@@ -102,7 +102,7 @@ class NewContactController: UITableViewController {
     // MARK: - coordinator
     private func showChat(chatId: Int) {
         if let chatlistViewController = navigationController?.viewControllers[0] {
-            let chatViewController = ChatViewControllerNew(dcContext: dcContext, chatId: chatId)
+            let chatViewController = ChatViewController(dcContext: dcContext, chatId: chatId)
             navigationController?.setViewControllers([chatlistViewController, chatViewController], animated: true)
         }
     }

deltachat-ios/Controller/NewGroupController.swift

@@ -322,7 +322,7 @@ class NewGroupController: UITableViewController, MediaPickerDelegate {
     // MARK: - coordinator
     private func showGroupChat(chatId: Int) {
         if let chatlistViewController = navigationController?.viewControllers[0] {
-            let chatViewController = ChatViewControllerNew(dcContext: dcContext, chatId: chatId)
+            let chatViewController = ChatViewController(dcContext: dcContext, chatId: chatId)
             navigationController?.setViewControllers([chatlistViewController, chatViewController], animated: true)
         }
     }

deltachat-ios/View/Cell/GalleryCell.swift

@@ -15,8 +15,8 @@ class GalleryCell: UICollectionViewCell {
         return view
     }()
 
-    private lazy var playButtonView: NewPlayButtonView = {
-        let playButtonView = NewPlayButtonView()
+    private lazy var playButtonView: PlayButtonView = {
+        let playButtonView = PlayButtonView()
         playButtonView.isHidden = true
         return playButtonView
     }()

deltachat-ios/View/PaddingTextView.swift

@@ -1,8 +1,8 @@
 import UIKit
 public class PaddingTextView: UIView {
 
-    public lazy var label: NewMessageLabel = {
-        let label = NewMessageLabel()
+    public lazy var label: MessageLabel = {
+        let label = MessageLabel()
         label.translatesAutoresizingMaskIntoConstraints = false
         label.numberOfLines = 0
         label.lineBreakMode = .byWordWrapping