diff --git a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift
index 79697e9eb..fa89f005c 100644
--- a/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift
+++ b/Account/Sources/Account/FeedProvider/Twitter/TwitterStatus.swift
@@ -91,8 +91,8 @@ private extension TwitterStatus {
 					}
 				}
 				
-				let offsetStartIndex = entity.startIndex - unicodeScalarOffset
-				let offsetEndIndex = entity.endIndex - unicodeScalarOffset
+				let offsetStartIndex = unicodeScalarOffset < entity.startIndex ? entity.startIndex - unicodeScalarOffset : entity.startIndex
+				let offsetEndIndex = unicodeScalarOffset < entity.endIndex ? entity.endIndex - unicodeScalarOffset : entity.endIndex
 				
 				let entityStartIndex = text.index(text.startIndex, offsetBy: offsetStartIndex, limitedBy: text.endIndex) ?? text.startIndex
 				let entityEndIndex = text.index(text.startIndex, offsetBy: offsetEndIndex, limitedBy: text.endIndex) ?? text.endIndex
diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown
index 8102b5fd3..4150dfb6c 100644
--- a/Technotes/ReleaseNotes-iOS.markdown
+++ b/Technotes/ReleaseNotes-iOS.markdown
@@ -1,5 +1,26 @@
 # iOS Release Notes
 
+### 6.0.1 TestFlight build 608 - 28 Aug 2021
+
+Fixed our top crashing bug — it could happen when updating a table view
+
+### 6.0.1 TestFlight build 607 - 21 Aug 2021
+
+Fixed bug where BazQux-synced feeds might stop updating
+Fixed bug where words prepended with $ wouldn’t appear in Twitter feeds
+Fixed bug where newlines would be just a space in Twitter feeds
+Fixed a crashing bug in Twitter rendering
+Fixed bug where hitting b key to open in browser wouldn’t always work
+Fixed a crashing bug due to running code off the main thread that needed to be on the main thread
+Fixed bug where article unread indicator could have wrong alpha in specific circumstances
+Fixed bug using right arrow key to move focus to Article view
+Fixed bug where long press could trigger a crash
+Fixed bug where external URLs in Feedbin feeds might be lost
+Fixed bug where favicons wouldn’t be found when a home page URL has non-ASCII characters
+Fixed bug where iCloud syncing could stop prematurely when the sync database has records not in the local database
+Fixed bug where creating a new folder in iCloud and moving feeds to it wouldn’t sync correctly
+
+
 ### 6.0 TestFlight build 604 - 31 May 2021
 
 This is a final candidate
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 068bce323..4351326c1 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -35,6 +35,12 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	
 	private let keyboardManager = KeyboardManager(type: .sidebar)
 	override var keyCommands: [UIKeyCommand]? {
+		
+		// If the first responder is the WKWebView (PreloadedWebView) we don't want to supply any keyboard
+		// commands that the system is looking for by going up the responder chain. They will interfere with
+		// the WKWebViews built in hardware keyboard shortcuts, specifically the up and down arrow keys.
+		guard let current = UIResponder.currentFirstResponder, !(current is PreloadedWebView) else { return nil }
+		
 		return keyboardManager.keyCommands
 	}
 	
diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
index 49b9f9ae8..2ec879473 100644
--- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
+++ b/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
@@ -229,12 +229,13 @@ private extension MasterTimelineTableViewCell {
 			}
 			unreadIndicatorPropertyAnimator?.startAnimation()
 		} else {
+			unreadIndicatorView.alpha = 1
 			showOrHideView(unreadIndicatorView, cellData.read || cellData.starred)
 		}
 	}
 	
 	func updateStarView() {
-		if !starView.isHidden &&  cellData.read && !cellData.starred {
+		if !starView.isHidden && cellData.read && !cellData.starred {
 			starViewPropertyAnimator = UIViewPropertyAnimator(duration: 0.66, curve: .easeInOut) { [weak self] in
 				self?.starView.alpha = 0
 			}
@@ -245,6 +246,7 @@ private extension MasterTimelineTableViewCell {
 			}
 			starViewPropertyAnimator?.startAnimation()
 		} else {
+			starView.alpha = 1
 			showOrHideView(starView, !cellData.starred)
 		}
 	}
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 770bc84bd..9cdd5d120 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -33,6 +33,12 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 	private let keyboardManager = KeyboardManager(type: .timeline)
 	override var keyCommands: [UIKeyCommand]? {
+		
+		// If the first responder is the WKWebView (PreloadedWebView) we don't want to supply any keyboard
+		// commands that the system is looking for by going up the responder chain. They will interfere with
+		// the WKWebViews built in hardware keyboard shortcuts, specifically the up and down arrow keys.
+		guard let current = UIResponder.currentFirstResponder, !(current is PreloadedWebView) else { return nil }
+		
 		return keyboardManager.keyCommands
 	}
 	
@@ -123,6 +129,15 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 	}
 	
 	// MARK: Actions
+	
+	@objc func openInBrowser(_ sender: Any?) {
+		coordinator.showBrowserForCurrentArticle()
+	}
+
+	@objc func openInAppBrowser(_ sender: Any?) {
+		coordinator.showInAppBrowser()
+	}
+	
 	@IBAction func toggleFilter(_ sender: Any) {
 		coordinator.toggleReadArticlesFilter()
 	}
diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
index ef5675d42..af737cd42 100644
--- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
+++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig
@@ -1,7 +1,7 @@
 
 // High Level Settings common to both the iOS application and any extensions we bundle with it
-MARKETING_VERSION = 6.0
-CURRENT_PROJECT_VERSION = 606
+MARKETING_VERSION = 6.0.1
+CURRENT_PROJECT_VERSION = 608
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon