diff --git a/scripts/langindex.json b/scripts/langindex.json
index 64c84def3..51ada972b 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -10,6 +10,7 @@
   "addon.badges.issuername": "badges",
   "addon.badges.nobadges": "badges",
   "addon.badges.recipientdetails": "badges",
+  "addon.block_myoverview.all": "block_myoverview",
   "addon.block_myoverview.future": "block_myoverview",
   "addon.block_myoverview.inprogress": "block_myoverview",
   "addon.block_myoverview.morecourses": "block_myoverview",
diff --git a/src/addon/block/myoverview/component/addon-block-myoverview.html b/src/addon/block/myoverview/component/addon-block-myoverview.html
index 2212cc77a..821029b6f 100644
--- a/src/addon/block/myoverview/component/addon-block-myoverview.html
+++ b/src/addon/block/myoverview/component/addon-block-myoverview.html
@@ -9,9 +9,10 @@
     <!-- "Time" selector. -->
     <div padding class="clearfix" [hidden]="showFilter" ion-row justify-content-end>
         <ion-select [hidden]="!showSelectorFilter" [title]="'core.show' | translate" [(ngModel)]="selectedFilter" ion-col (ngModelChange)="selectedChanged()" interface="popover" class="core-button-select">
-            <ion-option value="inprogress">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
-            <ion-option value="future">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
-            <ion-option value="past">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
+            <ion-option value="all">{{ 'addon.block_myoverview.all' | translate }}</ion-option>∫
+            <ion-option value="inprogress" *ngIf="courses.inprogress.length > 0">{{ 'addon.block_myoverview.inprogress' | translate }}</ion-option>
+            <ion-option value="future" *ngIf="courses.future.length > 0">{{ 'addon.block_myoverview.future' | translate }}</ion-option>
+            <ion-option value="past" *ngIf="courses.past.length > 0">{{ 'addon.block_myoverview.past' | translate }}</ion-option>
         </ion-select>
         <!-- Download all courses. -->
         <div *ngIf="downloadAllCoursesEnabled && courses[selectedFilter] && courses[selectedFilter].length > 1" class="core-button-spinner" ion-col text-end col-1>
@@ -22,9 +23,11 @@
             <ion-spinner *ngIf="!prefetchCoursesData[selectedFilter].icon || prefetchCoursesData[selectedFilter].icon == 'spinner'"></ion-spinner>
         </div>
     </div>
-    <core-empty-box *ngIf="courses[selectedFilter].length == 0 && selectedFilter == 'inprogress'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursesinprogress' | translate"></core-empty-box>
-    <core-empty-box *ngIf="courses[selectedFilter].length == 0 && selectedFilter == 'future'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursesfuture' | translate"></core-empty-box>
-    <core-empty-box *ngIf="courses[selectedFilter].length == 0 && selectedFilter == 'past'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursespast' | translate"></core-empty-box>
+    <ng-container *ngIf="courses[selectedFilter].length == 0">
+        <core-empty-box *ngIf="selectedFilter == 'inprogress'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursesinprogress' | translate"></core-empty-box>
+        <core-empty-box *ngIf="selectedFilter == 'future'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursesfuture' | translate"></core-empty-box>
+        <core-empty-box *ngIf="selectedFilter == 'past'" image="assets/img/icons/courses.svg" [message]="'addon.block_myoverview.nocoursespast' | translate"></core-empty-box>
+    </ng-container>
 
     <!-- Filter courses. -->
     <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="courses.filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
@@ -39,4 +42,4 @@
             </ion-row>
         </ion-grid>
     </div>
-</core-loading>
\ No newline at end of file
+</core-loading>
diff --git a/src/addon/block/myoverview/component/myoverview.ts b/src/addon/block/myoverview/component/myoverview.ts
index b3db61f7e..21176abce 100644
--- a/src/addon/block/myoverview/component/myoverview.ts
+++ b/src/addon/block/myoverview/component/myoverview.ts
@@ -36,6 +36,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement
 
     courses = {
         filter: '',
+        all: [],
         past: [],
         inprogress: [],
         future: []
@@ -44,6 +45,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement
     downloadAllCoursesEnabled: boolean;
     filteredCourses: any[];
     prefetchCoursesData = {
+        all: {},
         inprogress: {},
         past: {},
         future: {}
@@ -139,6 +141,7 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement
         }).then((courses) => {
             const today = moment().unix();
 
+            this.courses.all = courses;
             this.courses.past = [];
             this.courses.inprogress = [];
             this.courses.future = [];
diff --git a/src/addon/block/myoverview/lang/en.json b/src/addon/block/myoverview/lang/en.json
index ad5a1b7f7..b18d8b53e 100644
--- a/src/addon/block/myoverview/lang/en.json
+++ b/src/addon/block/myoverview/lang/en.json
@@ -1,4 +1,5 @@
 {
+    "all": "All",
     "future": "Future",
     "inprogress": "In progress",
     "past": "Past",
@@ -6,4 +7,4 @@
     "nocoursesfuture": "No future courses",
     "nocoursesinprogress": "No in progress courses",
     "nocoursespast": "No past courses"
-}
\ No newline at end of file
+}
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index 3b9112a85..d8dbc7f79 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -10,6 +10,7 @@
     "addon.badges.issuername": "Issuer name",
     "addon.badges.nobadges": "There are no badges available.",
     "addon.badges.recipientdetails": "Recipient details",
+    "addon.block_myoverview.all": "All",
     "addon.block_myoverview.future": "Future",
     "addon.block_myoverview.inprogress": "In progress",
     "addon.block_myoverview.morecourses": "More courses",
diff --git a/src/components/send-message-form/send-message-form.scss b/src/components/send-message-form/send-message-form.scss
index 784480f65..ea9f7c367 100644
--- a/src/components/send-message-form/send-message-form.scss
+++ b/src/components/send-message-form/send-message-form.scss
@@ -17,6 +17,7 @@ ion-app.app-root core-send-message-form {
     @include appearance(none);
     display: block;
     width: 100%;
+    min-height: 28px;
     border: 0;
     font-family: inherit;
     align-self: self-start;