diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart
index fcd6fa0e40f3b983f6c6b99d90cae0c235083572..d3de99511127b6e4508b232035b9b5cfae6f8ea8 100644
--- a/lib/ui/gallery_app_bar_widget.dart
+++ b/lib/ui/gallery_app_bar_widget.dart
@@ -271,10 +271,13 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   }
 
   void _showRemoveFromCollectionSheet(BuildContext context) {
+    final count = widget.selectedFiles.files.length;
     final action = CupertinoActionSheet(
       title: Text("Remove " +
-          widget.selectedFiles.files.length.toString() +
-          " files from " +
+          count.toString() +
+          " file" +
+          (count == 1 ? "" : "s") +
+          " from " +
           widget.collection.name +
           "?"),
       actions: <Widget>[
@@ -310,10 +313,12 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
   }
 
   void _showDeleteSheet(BuildContext context) {
+    final count = widget.selectedFiles.files.length;
     final action = CupertinoActionSheet(
       title: Text("Permanently delete " +
-          widget.selectedFiles.files.length.toString() +
-          " files?"),
+          count.toString() +
+          " file" +
+          (count == 1 ? "?" : "s?")),
       actions: <Widget>[
         CupertinoActionSheetAction(
           child: Text("Delete"),
diff --git a/lib/ui/share_collection_widget.dart b/lib/ui/share_collection_widget.dart
index 6ad86442aaf6ce3f12bc67ed46ad324541d0ac35..4c70aec4f32580dc97e98fa019d66dee48ca746c 100644
--- a/lib/ui/share_collection_widget.dart
+++ b/lib/ui/share_collection_widget.dart
@@ -38,7 +38,9 @@ class _SharingDialogState extends State<SharingDialog> {
     final children = List<Widget>();
     if (!_showEntryField &&
         (widget.collection == null || _sharees.length == 0)) {
-      children.add(Text("Click the + button to share this folder."));
+      children.add(Text("Click the + button to share this " +
+          Collection.typeToString(widget.collection.type) +
+          "."));
     } else {
       for (final email in _sharees) {
         children.add(EmailItemWidget(widget.collection.id, email));