Index: trunk/grails-app/i18n/messages.properties
===================================================================
--- trunk/grails-app/i18n/messages.properties	(revision 802)
+++ trunk/grails-app/i18n/messages.properties	(revision 803)
@@ -146,4 +146,5 @@
 task.trash.confirm=Trash, are you sure? \
     If authorised, recurrence will be disabled and Sub Task links will be forever removed!
+task.clear.attention.flag.on.completion.confirm=Clear Flag and Complete, are you sure?
 task.notFound=Could not complete operation, task not found.
 task.operationNotPermittedOnCompleteTask=This operation is not permitted on a complete task.
Index: trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/show.gsp	(revision 802)
+++ trunk/grails-app/views/taskDetailed/show.gsp	(revision 803)
@@ -271,5 +271,15 @@
                                         </g:else>
 
-                                        <span class="button"><g:actionSubmit class="complete" value="Resolved" action="complete"/></span>
+                                        <span class="button">
+                                            <g:if test="${taskInstance.attentionFlag}" >
+                                                <g:actionSubmit class="complete"
+                                                                        value="Resolved"
+                                                                        onclick="return confirm('${message(code:'task.clear.attention.flag.on.completion.confirm')}');"
+                                                                        action="complete"/>
+                                            </g:if>
+                                            <g:else>
+                                                <g:actionSubmit class="complete" value="Resolved" action="complete"/>
+                                            </g:else>
+                                        </span>
                                         <g:helpBalloon class="helpballoon" code="task.status.resolved" />