diff --git a/mythtv/libs/libmyth/programtypes.cpp b/mythtv/libs/libmyth/programtypes.cpp
index f9a520e0531..3167e812d76 100644
--- a/mythtv/libs/libmyth/programtypes.cpp
+++ b/mythtv/libs/libmyth/programtypes.cpp
@@ -249,7 +249,8 @@ QString toDescription(RecStatusType recstatus, RecordingType rectype,
     QString message;
     QDateTime now = MythDate::current();
 
-    if (recstatus <= rsWillRecord)
+    if (recstatus <= rsWillRecord ||
+        recstatus == rsOtherShowing)
     {
         switch (recstatus)
         {
@@ -274,38 +275,36 @@ QString toDescription(RecStatusType recstatus, RecordingType rectype,
                 message = QObject::tr("This showing was recorded.");
                 break;
             case rsAborted:
-                message = QObject::tr(
-                    "This showing was recorded but was aborted "
-                    "before recording was completed.");
+                message = QObject::tr("This showing was recorded but was "
+                                      "aborted before completion.");
                 break;
             case rsMissed:
-                message = QObject::tr(
-                    "This showing was not recorded because the "
-                    "master backend was hung or not running.");
-                break;
             case rsMissedFuture:
-                message = 
-                    "This showing was not recorded because the "
-                    "master backend was hung or not running.";
+                message = QObject::tr("This showing was not recorded because "
+                                      "the master backend was not running.");
                 break;
             case rsCancelled:
-                message = QObject::tr(
-                    "This showing was not recorded because it "
-                    "was manually cancelled.");
+                message = QObject::tr("This showing was not recorded because "
+                                      "it was manually cancelled.");
                 break;
             case rsLowDiskSpace:
-                message = QObject::tr(
-                    "There wasn't enough disk space available.");
+                message = QObject::tr("This showing was not recorded because "
+                                      "there wasn't enough disk space.");
                 break;
             case rsTunerBusy:
-                message = QObject::tr("The tuner card was already being used.");
+                message = QObject::tr("This showing was not recorded because "
+                                      "the recorder was already in use.");
                 break;
             case rsFailed:
-                message = QObject::tr("The recorder failed to record.");
+                message = QObject::tr("This showing was not recorded because "
+                                      "the recorder failed.");
+                break;
+            case rsOtherShowing:
+                message += QObject::tr("This showing will be recorded on a "
+                                       "different channel.");
                 break;
             default:
-                message = QObject::tr(
-                    "The status of this showing is unknown.");
+                message = QObject::tr("The status of this showing is unknown.");
                 break;
         }
 
@@ -346,7 +345,7 @@ QString toDescription(RecStatusType recstatus, RecordingType rectype,
             break;
         case rsLaterShowing:
             message += QObject::tr("this episode will be recorded at a "
-                                   "later time.");
+                                   "later time instead.");
             break;
         case rsRepeat:
             message += QObject::tr("this episode is a repeat.");
@@ -362,11 +361,7 @@ QString toDescription(RecStatusType recstatus, RecordingType rectype,
             message += QObject::tr("it was marked to never be recorded.");
             break;
         case rsOffLine:
-            message += QObject::tr("the backend recorder is off-line.");
-            break;
-        case rsOtherShowing:
-            message += QObject::tr("this episode will be recorded on a "
-                                   "different channel in this time slot.");
+            message += QObject::tr("the required recorder is off-line.");
             break;
         default:
             if (recstartts > now)
diff --git a/mythtv/programs/mythfrontend/schedulecommon.cpp b/mythtv/programs/mythfrontend/schedulecommon.cpp
index 7e9d4e2e9c7..14664de1e72 100644
--- a/mythtv/programs/mythfrontend/schedulecommon.cpp
+++ b/mythtv/programs/mythfrontend/schedulecommon.cpp
@@ -116,26 +116,6 @@ void ScheduleCommon::QuickRecord(ProgramInfo *pginfo)
     }
 }
 
-/**
-*  \brief Creates a dialog for editing the recording status,
-*         blocking until user leaves dialog.
-*/
-void ScheduleCommon::EditRecording(ProgramInfo *pginfo)
-{
-    if (!pginfo)
-        return;
-
-    RecordingInfo ri(*pginfo);
-
-    if (!ri.GetRecordingRuleID())
-        ShowNotScheduledDialog(ri);
-    else if (ri.GetRecordingStatus() <= rsWillRecord ||
-             ri.GetRecordingStatus() == rsOtherShowing)
-        ShowRecordingDialog(ri);
-    else
-        ShowNotRecordingDialog(ri);
-}
-
 /**
 *  \brief Creates a dialog for editing the recording schedule
 */
@@ -180,7 +160,7 @@ void ScheduleCommon::EditCustom(ProgramInfo *pginfo)
 /**
 *  \brief Creates a dialog for editing an override recording schedule
 */
-void ScheduleCommon::MakeOverride(RecordingInfo *recinfo, bool startActive)
+void ScheduleCommon::MakeOverride(RecordingInfo *recinfo)
 {
     if (!recinfo || !recinfo->GetRecordingRuleID())
         return;
@@ -196,8 +176,7 @@ void ScheduleCommon::MakeOverride(RecordingInfo *recinfo, bool startActive)
         delete recrule;
         return;
     }
-    if (startActive)
-        recrule->m_type = kOverrideRecord;
+    recrule->m_type = kOverrideRecord;
 
     MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
     ScheduleEditor *schededit = new ScheduleEditor(mainStack, recrule);
@@ -208,146 +187,16 @@ void ScheduleCommon::MakeOverride(RecordingInfo *recinfo, bool startActive)
 }
 
 /**
-*  \brief Creates a dialog displaying current recording status and options
-*         available
+*  \brief Creates a dialog for editing the recording status,
+*         blocking until user leaves dialog.
 */
-void ScheduleCommon::ShowRecordingDialog(const RecordingInfo& recinfo)
+void ScheduleCommon::EditRecording(ProgramInfo *pginfo)
 {
-    QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");
-
-    message += "\n\n";
-    message += toDescription(recinfo.GetRecordingStatus(),
-                             recinfo.GetRecordingRuleType(),
-                             recinfo.GetRecordingStartTime());
-
-    MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
-    MythDialogBox *menuPopup = new MythDialogBox(message, popupStack,
-                                                 "recOptionPopup", true);
-
-    if (menuPopup->Create())
-    {
-        menuPopup->SetReturnEvent(this, "schedulerecording");
-
-        QDateTime now = MythDate::current();
-
-        if (recinfo.GetRecordingStartTime() < now &&
-            recinfo.GetRecordingEndTime() > now)
-        {
-            if (recinfo.GetRecordingStatus() != rsRecording &&
-                recinfo.GetRecordingStatus() != rsTuning &&
-                recinfo.GetRecordingStatus() != rsOtherRecording && 
-                recinfo.GetRecordingStatus() != rsOtherTuning)
-                menuPopup->AddButton(tr("Restart recording this showing"),
-                                     qVariantFromValue(recinfo));
-            else
-                menuPopup->AddButton(tr("Stop recording this showing"),
-                                     qVariantFromValue(recinfo));
-        }
-
-        if (recinfo.GetRecordingEndTime() > now)
-        {
-            if (recinfo.GetRecordingRuleType() != kSingleRecord &&
-                recinfo.GetRecordingRuleType() != kOverrideRecord)
-            {
-                if (recinfo.GetRecordingStartTime() > now)
-                {
-                    menuPopup->AddButton(tr("Don't record this showing"),
-                                         qVariantFromValue(recinfo));
-                }
-
-                const RecordingDupMethodType dupmethod =
-                    recinfo.GetDuplicateCheckMethod();
-
-                if (recinfo.GetRecordingStatus() != rsRecording &&
-                    recinfo.GetRecordingStatus() != rsTuning &&
-                    recinfo.GetRecordingStatus() != rsOtherRecording &&
-                    recinfo.GetRecordingStatus() != rsOtherTuning &&
-                    recinfo.GetRecordingRuleType() != kOneRecord &&
-                    !((recinfo.GetFindID() == 0 ||
-                       !IsFindApplicable(recinfo)) &&
-                      recinfo.GetCategoryType() == "series" &&
-                      recinfo.GetProgramID().contains(QRegExp("0000$"))) &&
-                    ((!(dupmethod & kDupCheckNone) &&
-                      !recinfo.GetProgramID().isEmpty() &&
-                      (recinfo.GetFindID() != 0 ||
-                       !IsFindApplicable(recinfo))) ||
-                     ((dupmethod & kDupCheckSub) &&
-                      !recinfo.GetSubtitle().isEmpty()) ||
-                     ((dupmethod & kDupCheckDesc) &&
-                      !recinfo.GetDescription().isEmpty()) ||
-                     ((dupmethod & kDupCheckSubThenDesc) &&
-                      (!recinfo.GetSubtitle().isEmpty() ||
-                       !recinfo.GetDescription().isEmpty())) ))
-                    {
-                        menuPopup->AddButton(tr("Never record this episode"),
-                                             qVariantFromValue(recinfo));
-                    }
-            }
-
-            if (recinfo.GetRecordingRuleType() != kOverrideRecord &&
-                recinfo.GetRecordingRuleType() != kDontRecord)
-            {
-                if (recinfo.GetRecordingStatus() == rsRecording ||
-                    recinfo.GetRecordingStatus() == rsTuning ||
-                    recinfo.GetRecordingStatus() == rsOtherRecording ||
-                    recinfo.GetRecordingStatus() == rsOtherTuning)
-                {
-                    menuPopup->AddButton(tr("Edit options for this showing"),
-                                         qVariantFromValue(recinfo));
-                }
-                else
-                {
-                    if (recinfo.GetRecordingRuleType() != kSingleRecord)
-                    {
-                        menuPopup->AddButton(tr("Override this showing with options"),
-                                             qVariantFromValue(recinfo));
-                    }
-
-                }
-            }
-
-            if (recinfo.GetRecordingRuleType() == kOverrideRecord ||
-                recinfo.GetRecordingRuleType() == kDontRecord)
-            {
-                if (recinfo.GetRecordingStatus() == rsRecording ||
-                    recinfo.GetRecordingStatus() == rsTuning ||
-                    recinfo.GetRecordingStatus() == rsOtherRecording ||
-                    recinfo.GetRecordingStatus() == rsOtherTuning)
-                {
-                    menuPopup->AddButton(tr("Edit options for this showing"),
-                                         qVariantFromValue(recinfo));
-                }
-                else
-                {
-                    menuPopup->AddButton(tr("Edit override options"),
-                                         qVariantFromValue(recinfo));
-                    menuPopup->AddButton(tr("Delete override rule"),
-                                         qVariantFromValue(recinfo));
-                }
-            }
-        }
+    if (!pginfo)
+        return;
 
-        if (recinfo.GetRecordingRuleType() != kOverrideRecord &&
-            recinfo.GetRecordingRuleType() != kDontRecord)
-        {
-            menuPopup->AddButton(tr("Edit recording options"),
-                                 qVariantFromValue(recinfo));
-            menuPopup->AddButton(tr("Delete recording rule"),
-                                 qVariantFromValue(recinfo));
-        }
+    RecordingInfo recinfo(*pginfo);
 
-        popupStack->AddScreen(menuPopup);
-    }
-    else
-        delete menuPopup;
-}
-
-/**
-*  \brief Creates a dialog displaying current recording status and options
-*         available
-*/
-void ScheduleCommon::ShowNotRecordingDialog(const RecordingInfo& recinfo)
-{
     QString timeFormat = gCoreContext->GetSetting("TimeFormat", "h:mm AP");
 
     QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");
@@ -393,160 +242,138 @@ void ScheduleCommon::ShowNotRecordingDialog(const RecordingInfo& recinfo)
 
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
     MythDialogBox *menuPopup = new MythDialogBox(message, popupStack,
-                                                 "notRecOptionPopup", true);
-
-    if (menuPopup->Create())
+                                                 "recOptionPopup", true);
+    if (!menuPopup->Create())
     {
-        menuPopup->SetReturnEvent(this, "schedulenotrecording");
+        delete menuPopup;
+        return;
+    }
+    menuPopup->SetReturnEvent(this, "editrecording");
 
-        QDateTime now = MythDate::current();
+    QDateTime now = MythDate::current();
 
-        if ((recinfo.GetRecordingStartTime() < now) &&
-            (recinfo.GetRecordingEndTime() > now) &&
-            (recinfo.GetRecordingStatus() != rsDontRecord) &&
-            (recinfo.GetRecordingStatus() != rsNotListed))
+    if (recinfo.GetRecordingStatus() == rsUnknown)
+    {
+        if (recinfo.GetRecordingEndTime() > now)
+            menuPopup->AddButton(tr("Record this showing"),
+                                 qVariantFromValue(recinfo));
+        menuPopup->AddButton(tr("Record all showings"),
+                             qVariantFromValue(recinfo));
+        if (!recinfo.IsGeneric())
+            menuPopup->AddButton(tr("Record one showing (this episode)"),
+                                 qVariantFromValue(recinfo));
+        menuPopup->AddButton(tr("Record all showings (this channel)"),
+                             qVariantFromValue(recinfo));
+        menuPopup->AddButton(tr("Edit recording rule"),
+                             qVariantFromValue(recinfo));
+    }
+    else if (recinfo.GetRecordingStatus() == rsRecording ||
+        recinfo.GetRecordingStatus() == rsTuning ||
+        recinfo.GetRecordingStatus() == rsOtherRecording ||
+        recinfo.GetRecordingStatus() == rsOtherTuning)
+    {
+        menuPopup->AddButton(tr("Stop this recording"),
+                             qVariantFromValue(recinfo));
+        menuPopup->AddButton(tr("Modify recording options"),
+                             qVariantFromValue(recinfo));
+    }
+    else
+    {
+        if (recinfo.GetRecordingStartTime() < now &&
+            recinfo.GetRecordingEndTime() > now &&
+            recinfo.GetRecordingStatus() != rsDontRecord &&
+            recinfo.GetRecordingStatus() != rsNotListed)
         {
-            menuPopup->AddButton(tr("Restart recording this showing"),
+            menuPopup->AddButton(tr("Restart this recording"),
                                  qVariantFromValue(recinfo));
         }
 
-        if (recinfo.GetRecordingEndTime() > now)
+        if (recinfo.GetRecordingEndTime() > now &&
+            recinfo.GetRecordingRuleType() != kSingleRecord &&
+            recinfo.GetRecordingRuleType() != kOverrideRecord &&
+            (recinfo.GetRecordingStatus() == rsDontRecord ||
+             recinfo.GetRecordingStatus() == rsPreviousRecording ||
+             recinfo.GetRecordingStatus() == rsCurrentRecording ||
+             recinfo.GetRecordingStatus() == rsEarlierShowing ||
+             recinfo.GetRecordingStatus() == rsTooManyRecordings ||
+             recinfo.GetRecordingStatus() == rsLaterShowing ||
+             recinfo.GetRecordingStatus() == rsRepeat ||
+             recinfo.GetRecordingStatus() == rsInactive ||
+             recinfo.GetRecordingStatus() == rsNeverRecord))
         {
-            if ((recinfo.GetRecordingRuleType() != kSingleRecord &&
-                recinfo.GetRecordingRuleType() != kOverrideRecord) &&
-                (recinfo.GetRecordingStatus() == rsDontRecord ||
-                recinfo.GetRecordingStatus() == rsPreviousRecording ||
-                recinfo.GetRecordingStatus() == rsCurrentRecording ||
-                recinfo.GetRecordingStatus() == rsEarlierShowing ||
-                recinfo.GetRecordingStatus() == rsNeverRecord ||
-                recinfo.GetRecordingStatus() == rsRepeat ||
-                recinfo.GetRecordingStatus() == rsInactive ||
-                recinfo.GetRecordingStatus() == rsLaterShowing))
+            menuPopup->AddButton(tr("Record this showing"),
+                                 qVariantFromValue(recinfo));
+            if (recinfo.GetRecordingStartTime() > now &&
+                (recinfo.GetRecordingStatus() == rsPreviousRecording ||
+                 recinfo.GetRecordingStatus() == rsNeverRecord))
             {
-                menuPopup->AddButton(tr("Record this showing anyway"),
-                                    qVariantFromValue(recinfo));
-                if (recinfo.GetRecordingStatus() == rsPreviousRecording ||
-                    recinfo.GetRecordingStatus() == rsNeverRecord)
-                {
-                    menuPopup->AddButton(tr("Forget previous recording"),
-                                        qVariantFromValue(recinfo));
-                }
+                menuPopup->AddButton(tr("Forget previous recording"),
+                                     qVariantFromValue(recinfo));
             }
+        }
 
-            if (recinfo.GetRecordingRuleType() != kOverrideRecord &&
-                recinfo.GetRecordingRuleType() != kDontRecord)
-            {
-                if (recinfo.GetRecordingRuleType() != kSingleRecord &&
-                    recinfo.GetRecordingStatus() != rsPreviousRecording &&
-                    recinfo.GetRecordingStatus() != rsCurrentRecording &&
-                    recinfo.GetRecordingStatus() != rsNeverRecord &&
-                    recinfo.GetRecordingStatus() != rsNotListed)
-                {
-                    if (recinfo.GetRecordingStartTime() > now)
-                    {
-                        menuPopup->AddButton(tr("Don't record this showing"),
-                                            qVariantFromValue(recinfo));
-                    }
-
-                    const RecordingDupMethodType dupmethod =
-                        recinfo.GetDuplicateCheckMethod();
-
-                    if (recinfo.GetRecordingRuleType() != kOneRecord &&
-                        !((recinfo.GetFindID() == 0 ||
-                           !IsFindApplicable(recinfo)) &&
-                          recinfo.GetCategoryType() == "series" &&
-                          recinfo.GetProgramID().contains(QRegExp("0000$"))) &&
-                        ((!(dupmethod & kDupCheckNone) &&
-                          !recinfo.GetProgramID().isEmpty() &&
-                          (recinfo.GetFindID() != 0 ||
-                           !IsFindApplicable(recinfo))) ||
-                         ((dupmethod & kDupCheckSub) &&
-                          !recinfo.GetSubtitle().isEmpty()) ||
-                         ((dupmethod & kDupCheckDesc) &&
-                          !recinfo.GetDescription().isEmpty()) ||
-                         ((dupmethod & kDupCheckSubThenDesc) &&
-                          (!recinfo.GetSubtitle().isEmpty() ||
-                           !recinfo.GetDescription().isEmpty())) ))
-                        {
-                            menuPopup->AddButton(tr("Never record this episode"),
-                                                 qVariantFromValue(recinfo));
-                        }
-                }
-
-                if (recinfo.GetRecordingRuleType() != kSingleRecord &&
-                    recinfo.GetRecordingRuleType() != kOneRecord &&
-                    recinfo.GetRecordingStatus() != rsNotListed)
-                {
-                    menuPopup->AddButton(tr("Override this showing with options"),
-                                        qVariantFromValue(recinfo));
-                }
-
-                menuPopup->AddButton(tr("Edit recording options"),
-                                     qVariantFromValue(recinfo));
-                menuPopup->AddButton(tr("Delete recording rule"),
+        if (recinfo.GetRecordingRuleType() != kSingleRecord &&
+            recinfo.GetRecordingRuleType() != kDontRecord &&
+            (recinfo.GetRecordingStatus() == rsWillRecord ||
+             recinfo.GetRecordingStatus() == rsCurrentRecording ||
+             recinfo.GetRecordingStatus() == rsEarlierShowing ||
+             recinfo.GetRecordingStatus() == rsTooManyRecordings ||
+             recinfo.GetRecordingStatus() == rsConflict ||
+             recinfo.GetRecordingStatus() == rsLaterShowing ||
+             recinfo.GetRecordingStatus() == rsOffLine ||
+             recinfo.GetRecordingStatus() == rsOtherShowing))
+        {
+            if (recinfo.GetRecordingStatus() == rsWillRecord ||
+                recinfo.GetRecordingStatus() == rsOtherShowing)
+                menuPopup->AddButton(tr("Don't record this showing"),
                                      qVariantFromValue(recinfo));
-            }
 
-            if (recinfo.GetRecordingRuleType() == kOverrideRecord ||
-                recinfo.GetRecordingRuleType() == kDontRecord)
+            const RecordingDupMethodType dupmethod =
+                recinfo.GetDuplicateCheckMethod();
+            if (recinfo.GetRecordingRuleType() != kOverrideRecord &&
+                !((recinfo.GetFindID() == 0 ||
+                   !IsFindApplicable(recinfo)) &&
+                  recinfo.GetCategoryType() == "series" &&
+                  recinfo.GetProgramID().contains(QRegExp("0000$"))) &&
+                ((!(dupmethod & kDupCheckNone) &&
+                  !recinfo.GetProgramID().isEmpty() &&
+                  (recinfo.GetFindID() != 0 ||
+                   !IsFindApplicable(recinfo))) ||
+                 ((dupmethod & kDupCheckSub) &&
+                  !recinfo.GetSubtitle().isEmpty()) ||
+                 ((dupmethod & kDupCheckDesc) &&
+                  !recinfo.GetDescription().isEmpty()) ||
+                 ((dupmethod & kDupCheckSubThenDesc) &&
+                  (!recinfo.GetSubtitle().isEmpty() ||
+                   !recinfo.GetDescription().isEmpty())) ))
             {
-                menuPopup->AddButton(tr("Edit override options"),
-                                    qVariantFromValue(recinfo));
-                menuPopup->AddButton(tr("Delete override rule"),
-                                    qVariantFromValue(recinfo));
+                menuPopup->AddButton(tr("Never record this episode"),
+                                     qVariantFromValue(recinfo));
             }
         }
 
-        popupStack->AddScreen(menuPopup);
-    }
-    else
-        delete menuPopup;
-}
-
-/**
-*  \brief Creates a dialog displaying current recording status and options
-*         available
-*/
-void ScheduleCommon::ShowNotScheduledDialog(const RecordingInfo& recinfo)
-{
-    QString message = recinfo.toString(ProgramInfo::kTitleSubtitle, " - ");
-
-    message += "\n\n";
-    message += toDescription(recinfo.GetRecordingStatus(),
-                             recinfo.GetRecordingRuleType(),
-                             recinfo.GetRecordingStartTime());
-
-    MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
-    MythDialogBox *menuPopup = new MythDialogBox(message, popupStack,
-                                                 "notSchedOptionPopup", true);
-
-    if (menuPopup->Create())
-    {
-        menuPopup->SetReturnEvent(this, "schedulenotscheduled");
-
-        QDateTime now = MythDate::current();
-
-        if (recinfo.GetRecordingEndTime() > now)
-            menuPopup->AddButton(tr("Record only this showing"),
+        if (recinfo.GetRecordingRuleType() == kOverrideRecord ||
+            recinfo.GetRecordingRuleType() == kDontRecord)
+        {
+            menuPopup->AddButton(tr("Edit override rule"),
                                  qVariantFromValue(recinfo));
-
-        menuPopup->AddButton(tr("Record all showings"),
-                             qVariantFromValue(recinfo));
-
-        if (!recinfo.IsGeneric())
-            menuPopup->AddButton(tr("Record one showing of this episode"),
+            menuPopup->AddButton(tr("Delete override rule"),
                                  qVariantFromValue(recinfo));
-
-        menuPopup->AddButton(tr("Record all showings on this channel"),
-                             qVariantFromValue(recinfo));
-
-        menuPopup->AddButton(tr("Record with more options"),
-                             qVariantFromValue(recinfo));
-
-        popupStack->AddScreen(menuPopup);
+        }
+        else
+        {
+            if (recinfo.GetRecordingRuleType() != kSingleRecord &&
+                recinfo.GetRecordingStatus() != rsNotListed)
+                menuPopup->AddButton(tr("Add override rule"),
+                                     qVariantFromValue(recinfo));
+            menuPopup->AddButton(tr("Edit recording rule"),
+                                 qVariantFromValue(recinfo));
+            menuPopup->AddButton(tr("Delete recording rule"),
+                                 qVariantFromValue(recinfo));
+        }
     }
-    else
-        delete menuPopup;
+
+    popupStack->AddScreen(menuPopup);
 }
 
 void ScheduleCommon::customEvent(QEvent *event)
@@ -558,7 +385,7 @@ void ScheduleCommon::customEvent(QEvent *event)
         QString resultid   = dce->GetId();
         QString resulttext = dce->GetResultText();
 
-        if (resultid == "schedulenotscheduled")
+        if (resultid == "editrecording")
         {
             if (!qVariantCanConvert<RecordingInfo>(dce->GetData()))
                 return;
@@ -566,43 +393,50 @@ void ScheduleCommon::customEvent(QEvent *event)
             RecordingInfo recInfo = qVariantValue<RecordingInfo>
                 (dce->GetData());
 
-            if (resulttext == tr("Record only this showing"))
-                recInfo.ApplyRecordStateChange(kSingleRecord);
+            if (resulttext == tr("Record this showing"))
+            {
+                if (recInfo.GetRecordingRuleType() == kNotRecording)
+                    recInfo.ApplyRecordStateChange(kSingleRecord);
+                else
+                {
+                    recInfo.ApplyRecordStateChange(kOverrideRecord);
+                    if (recInfo.GetRecordingStartTime() < MythDate::current())
+                        recInfo.ReactivateRecording();
+                }
+            }
             else if (resulttext == tr("Record all showings"))
                 recInfo.ApplyRecordStateChange(kAllRecord);
-            else if (resulttext == tr("Record one showing of this episode"))
+            else if (resulttext == tr("Record one showing (this episode)"))
             {
                 recInfo.ApplyRecordStateChange(kOneRecord, false);
                 recInfo.GetRecordingRule()->m_filter |= 64; // This episode
                 recInfo.GetRecordingRule()->Save();
             }
-            else if (resulttext == tr("Record all showings on this channel"))
+            else if (resulttext == tr("Record all showings (this channel)"))
             {
                 recInfo.ApplyRecordStateChange(kAllRecord, false);
                 recInfo.GetRecordingRule()->m_filter |= 1024; // This channel
                 recInfo.GetRecordingRule()->Save();
             }
-            else if (resulttext == tr("Record with more options"))
+            else if (resulttext == tr("Stop this recording"))
             {
-                EditScheduled(&recInfo);
+                ProgramInfo pginfo(
+                    recInfo.GetChanID(), recInfo.GetRecordingStartTime());
+                if (pginfo.GetChanID())
+                    RemoteStopRecording(&pginfo);
             }
-        }
-        else if (resultid == "schedulenotrecording")
-        {
-            if (!qVariantCanConvert<RecordingInfo>(dce->GetData()))
-                return;
-
-            RecordingInfo recInfo = qVariantValue<RecordingInfo>
-                (dce->GetData());
-
-            if (resulttext == tr("Restart recording this showing"))
-                recInfo.ReactivateRecording();
-            else if (resulttext == tr("Record this showing anyway"))
+            else if (resulttext == tr("Modify recording options") ||
+                     resulttext == tr("Add override rule"))
             {
-                recInfo.ApplyRecordStateChange(kOverrideRecord);
-                if (recInfo.GetRecordingStartTime() < MythDate::current())
-                    recInfo.ReactivateRecording();
+                if (recInfo.GetRecordingRuleType() == kSingleRecord ||
+                    recInfo.GetRecordingRuleType() == kOverrideRecord ||
+                    recInfo.GetRecordingRuleType() == kOneRecord)
+                    EditScheduled(&recInfo);
+                else
+                    MakeOverride(&recInfo);
             }
+            else if (resulttext == tr("Restart this recording"))
+                recInfo.ReactivateRecording();
             else if (resulttext == tr("Forget previous recording"))
                 recInfo.ForgetHistory();
             else if (resulttext == tr("Don't record this showing"))
@@ -614,66 +448,12 @@ void ScheduleCommon::customEvent(QEvent *event)
                 recInfo.SetScheduledEndTime(recInfo.GetRecordingStartTime());
                 recInfo.AddHistory(true, true);
             }
-            else if (resulttext == tr("Delete override rule") ||
-                     resulttext == tr("Delete recording rule"))
-                recInfo.ApplyRecordStateChange(kNotRecording);
-            else if (resulttext == tr("Edit override options") ||
-                     resulttext == tr("Edit recording options"))
-            {
+            else if (resulttext == tr("Edit recording rule") ||
+                     resulttext == tr("Edit override rule"))
                 EditScheduled(&recInfo);
-            }
-            else if (resulttext == tr("Override this showing with options"))
-            {
-                MakeOverride(&recInfo);
-            }
-        }
-        else if (resultid == "schedulerecording")
-        {
-            if (!qVariantCanConvert<RecordingInfo>(dce->GetData()))
-                return;
-
-            RecordingInfo recInfo = qVariantValue<RecordingInfo>
-                                                            (dce->GetData());
-
-            if (resulttext == tr("Restart recording this showing"))
-                recInfo.ReactivateRecording();
-            else if (resulttext == tr("Stop recording this showing"))
-            {
-                ProgramInfo pginfo(
-                    recInfo.GetChanID(), recInfo.GetRecordingStartTime());
-                if (pginfo.GetChanID())
-                    RemoteStopRecording(&pginfo);
-            }
-            else if (resulttext == tr("Don't record this showing"))
-                recInfo.ApplyRecordStateChange(kDontRecord);
-            else if (resulttext == tr("Never record this episode"))
-            {
-                recInfo.SetRecordingStatus(rsNeverRecord);
-                recInfo.SetScheduledStartTime(MythDate::current());
-                recInfo.SetScheduledEndTime(recInfo.GetRecordingStartTime());
-                recInfo.AddHistory(true, true);
-            }
-            else if (resulttext == tr("Delete override rule") ||
-                     resulttext == tr("Delete recording rule"))
+            else if (resulttext == tr("Delete recording rule") ||
+                     resulttext == tr("Delete override rule"))
                 recInfo.ApplyRecordStateChange(kNotRecording);
-            else if (resulttext == tr("Edit options for this showing"))
-            {
-                if (recInfo.GetRecordingRuleType() == kSingleRecord ||
-                    recInfo.GetRecordingRuleType() == kOverrideRecord ||
-                    recInfo.GetRecordingRuleType() == kOneRecord)
-                    EditScheduled(&recInfo);
-                else
-                    MakeOverride(&recInfo, true);
-            }
-            else if (resulttext == tr("Edit override options") ||
-                     resulttext == tr("Edit recording options"))
-            {
-                EditScheduled(&recInfo);
-            }
-            else if (resulttext == tr("Override this showing with options"))
-            {
-                MakeOverride(&recInfo);
-            }
         }
     }
 }
diff --git a/mythtv/programs/mythfrontend/schedulecommon.h b/mythtv/programs/mythfrontend/schedulecommon.h
index 4e580e57924..6f1e7b800ce 100644
--- a/mythtv/programs/mythfrontend/schedulecommon.h
+++ b/mythtv/programs/mythfrontend/schedulecommon.h
@@ -30,10 +30,7 @@ class ScheduleCommon : public MythScreenType
     void EditScheduled(ProgramInfo *pginfo);
     void EditScheduled(RecordingInfo *recinfo);
     void EditCustom(ProgramInfo *pginfo);
-    void MakeOverride(RecordingInfo *recinfo, bool startActive = false);
-    void ShowRecordingDialog(const RecordingInfo &recinfo);
-    void ShowNotRecordingDialog(const RecordingInfo &recinfo);
-    void ShowNotScheduledDialog(const RecordingInfo &recinfo);
+    void MakeOverride(RecordingInfo *recinfo);
 
     virtual void customEvent(QEvent*);